]> 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, 15 Nov 2011 23:49:15 +0000 (10:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:49:15 +0000 (10:49 +1100)
commitb50a51c51e9101299dacb90bfb1139f8a37b9c1d
tree77f87da2477ccf56185aa277413aee7fcf93adc4
parentc219438a5062073c2d4d1f832e8febebb9917bea
parent9b3fd2438c9cb19e7c7211c8dc33c45e1cb58bdf
Merge remote-tracking branch 'slave-dma/next'

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