From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Mar 2016 23:31:41 +0000 (-0700)
Subject: Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.6-rc1~167
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5ec942463bfbc6c98ea4a96689b498e88a031c4a;p=linux-2.6-block.git

Merge branch 'mm-pat-for-linus' of git://git./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()
---

5ec942463bfbc6c98ea4a96689b498e88a031c4a