]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:37:23 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:37:27 +0000 (11:37 +1000)
commite666ca43d03ad108f4309ee64968fb664d553086
tree2f1b5971ed86cf537a6c6ab984791e59dd646f45
parent51b853d46206623abc6db97939fb4e02902fc3aa
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