]> 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, 26 Jul 2011 03:23:01 +0000 (13:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:23:01 +0000 (13:23 +1000)
commit60c93c4a13d4349ca12deda915a2b49f1a675437
treea697b3bea1e7e2a2761e028985d85573e161841b
parent535058f7a6fabb252d44c9b6c32af12adbb92fef
parentbf89d7131dfb33e7d61deb811867e4a89b6676d3
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/mv_xor.c
drivers/dma/coh901318.c
drivers/dma/dmaengine.c
drivers/dma/imx-sdma.c
drivers/dma/ipu/ipu_idmac.c
drivers/dma/ste_dma40.c