Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 15 Jul 2013 09:13:54 +0000 (11:13 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 15 Jul 2013 09:13:54 +0000 (11:13 +0200)
commitf7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e
treec56a58601b743997051a94532d4cb9b27f9a4635
parentad81f0545ef01ea651886dddac4bef6cec930092
parentf825c736e75b11adb59ec52a4a1096efddd2ec97
Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

Conflicts:
mm/Kconfig

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
arch/arm/mm/dma-mapping.c
drivers/base/Kconfig
drivers/base/Makefile
mm/Kconfig