Merge remote-tracking branch 'slave-dma/next'

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/am335x-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/am437x-gp-evm.dts
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
index b61156b87685cbc27905bacb3ac070781500208e,4bef66b4325bc2e14b70d1ff8039a23793427985..5076d3f334d28753e697b9e801b050c5807cadad
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -96,9 -94,7 +96,8 @@@ config ARCH_OMAP2PLU
        select OMAP_GPMC
        select PINCTRL
        select SOC_BUS
-       select TI_PRIV_EDMA
        select OMAP_IRQCHIP
 +      select CLKSRC_TI_32K
        help
          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
  

diff --cc drivers/dma/acpi-dma.c
Simple merge