]> 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, 18 Nov 2011 01:13:27 +0000 (12:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 01:13:27 +0000 (12:13 +1100)
commit5cd78b78c5828922d0b8ba0a419d10c4d3676f46
tree7b082a61648dc61f357ce440d58dce6d5b279c3b
parentcbc209f6806a102ee9f1d7df80c8603fecc4a197
parentca7fe2db892dcf91b2c72ee352eda4ff867903a7
Merge remote-tracking branch 'slave-dma/next'

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