From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Sep 2013 17:26:33 +0000 (-0700)
Subject: Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: v3.12-rc1~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA mapping update from Marek Szyprowski:
 "This contains an addition of Device Tree support for reserved memory
  regions (Contiguous Memory Allocator is one of the drivers for it) and
  changes required by the KVM extensions for PowerPC architectue"

* 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: init: add support for reserved memory defined by device tree
  drivers: of: add initialization code for dma reserved memory
  drivers: of: add function to scan fdt nodes given by path
  drivers: dma-contiguous: clean source code and prepare for device tree
---

64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d