Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:59:58 +0000 (11:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:59:58 +0000 (11:59 +1100)
commit5334042fa85da2e52ad709c6b5a95b33e02bc5d5
treef0bb4976c9421efa89c060ddc9eb85ce0c75d717
parent5c46ad47e9be97f788f12f4ebef961c54bb2f06a
parentfa3cd2a2b8408b6ef6bcb5fdaf3e8aaddfbd45dc
Merge remote-tracking branch 'slave-dma/next'
arch/arm/Kconfig
arch/arm/mach-omap2/Kconfig
drivers/dma/acpi-dma.c