]> 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, 1 Sep 2011 00:43:05 +0000 (10:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 00:43:05 +0000 (10:43 +1000)
commit375695c1698c44678c53d65bc0b47fabe5be91aa
tree7b85920d02f9e4ae3f02f9eea4ef56d2d8572a4e
parent0026995bd4f868f159919a4c11469d1c2d8d21b5
parent7b4b88e067d37cbbafd856121767f7e154294eb2
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/amba-pl08x.c
drivers/dma/amba-pl08x.c