]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:33:03 +0000 (13:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:33:03 +0000 (13:33 +1000)
commitb7b355b06be527418e13e2acb80c3b75945061ab
treeb8766ef14830caa2f6a08a73b4f79df4fc0433ba
parent14df9d1b50a38f0c21469af3aace4c3eeb5cdfc7
parent1ae105aa7416087f2920c35c3cd16831d0d09c9c
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