tree f1641c53b07f1a56e1a6c733a33b26887cf34db9
parent fbed0bc0915e2dec7452fc3e66ad03dd2b0c04c7
parent f6e45661f9be546811b62b2b01f32f4bf0c436c0
author Linus Torvalds <torvalds@linux-foundation.org> 1457998301 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1457998301 -0700

Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull dma_*_writecombine rename from Ingo Molnar:
 "Rename dma_*_writecombine() to dma_*_wc()

  This is a tree-wide API rename, to move the dma_*() write-combining
  APIs closer in name to their usual API families.  (The old API names
  are kept as compatibility wrappers to not introduce extra breakage.)

  The patch was Coccinelle generated"

* 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()