]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 00:05:38 +0000 (11:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 00:05:42 +0000 (11:05 +1100)
commit47ab7826cae651cb22fff457292056a4bb5ee0c4
tree5d36e3fc58fd4d623f4d1283398bddfdf159ff75
parenta2176ba26de65b5cb1d5402ef69b4aeb732122fd
parentd0fc905429f7f5f3ad365466669c55b04b92c1e5
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