]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:18:32 +0000 (12:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:18:32 +0000 (12:18 +1100)
commitbdadd1e8e6fdf7ed38043a00557bccbfe8f0197d
treeb5ede10d7baf748d7ae48db64b5732680ee55534
parentcfe9bfbe8ed42081abd1a125109a7973469e6ad1
parent7f3498666c7b44f979720404d9ba883c309e60ad
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c