]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:32:27 +0000 (11:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:32:27 +0000 (11:32 +1100)
commitf2fa4ed34b4242583c5e720d86f75ac36f28e226
tree86f965555118aea07ce44b6c98ee69e3c9df82b3
parent8d5944da4062507780fccd5419e115a4c8e76ff0
parent7f3498666c7b44f979720404d9ba883c309e60ad
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c