projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1cf11d 8f33d52)
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <[email protected]>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
committerLinus Torvalds <[email protected]>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmaengine: provide dummy functions for DMA_ENGINE=n
  mv_xor: fix race in tasklet function


Trivial merge
John Crispins staging tree