]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:13:12 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:13:12 +0000 (13:13 +1100)
commit18868dc6f776372cb0742e5d36436bb8220daaa5
treeb944cb2555de1b4015bcf5db87e3a91ce033f7ac
parentfcc251bd737ca4cceca97b5eb3d12b5dfdf4515d
parent7f3498666c7b44f979720404d9ba883c309e60ad
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c