Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next
authorAlexander Graf <agraf@suse.de>
Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
committerAlexander Graf <agraf@suse.de>
Mon, 8 Jul 2013 14:16:56 +0000 (16:16 +0200)
Add prerequisite patch for CMA RMA allocation patches

1  2 
arch/arm/mm/dma-mapping.c
drivers/base/Kconfig
mm/Kconfig

Simple merge
Simple merge
diff --cc mm/Kconfig
Simple merge