Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next

author Alexander Graf <agraf@suse.de>

Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)

committer Alexander Graf <agraf@suse.de>

Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
author Alexander Graf <agraf@suse.de>
Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
committer Alexander Graf <agraf@suse.de>
Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
diff --cc drivers/base/Kconfig
Simple merge
diff --cc mm/Kconfig
Simple merge
author	Alexander Graf <agraf@suse.de>
	Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
committer	Alexander Graf <agraf@suse.de>
	Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
		1	2
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history