]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:46:21 +0000 (12:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:46:25 +0000 (12:46 +1000)
commitb7a7e38cbab00951dc8c677ed3112b64e1ee6fe5
treec9cda27397c0321233bc298f174befc723430a7e
parentae900a90e0a12f35da53bbd30d72533ab797d029
parent3d4f860583bf4aa55dd5c6d5ba6ccf1f25fb473a
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/mmp_tdma.c
drivers/mmc/host/davinci_mmc.c
drivers/spi/spi-davinci.c
arch/arm/mach-spear13xx/spear13xx.c
drivers/dma/mmp_tdma.c
drivers/dma/pl330.c
drivers/dma/tegra20-apb-dma.c
drivers/mmc/host/davinci_mmc.c
drivers/spi/Kconfig
drivers/spi/spi-davinci.c