]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:16:54 +0000 (11:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:16:57 +0000 (11:16 +1100)
commitcaca78a492cc69621a9e003ef2d9172d11882bee
tree1329a6f4ef0aa9699685e9dac1e94956cf0d1f3a
parent6b5cf1da3771d91e828f02c18193cc1ad4ee55ef
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/mxs-dma.c
drivers/dma/pl330.c
drivers/dma/sirf-dma.c
drivers/dma/ste_dma40.c
drivers/dma/tegra20-apb-dma.c
drivers/mmc/host/davinci_mmc.c
drivers/spi/Kconfig
drivers/spi/spi-davinci.c