]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:50:34 +0000 (11:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:50:34 +0000 (11:50 +1100)
commitab07cd7b755ed525aad498dc550c4aed10c332a1
tree34f5fa468e03228f1e497f6fc14a555393c36350
parent0a8887e798028ad57c9281b611b4d79472b71c3a
parent9b3fd2438c9cb19e7c7211c8dc33c45e1cb58bdf
Merge remote-tracking branch 'slave-dma/next'

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