]> 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, 14 Nov 2011 00:34:43 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 00:34:43 +0000 (11:34 +1100)
commit32993e1d180f0ace512ddbfcf7402aab39d0915d
tree34ba76d284194007c8bbe739b810c406f0af3a0b
parent8e53c32c890194ef40d14b6cea10a97f4f3831fb
parent9b3fd2438c9cb19e7c7211c8dc33c45e1cb58bdf
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c
drivers/dma/pl330.c