]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
commit09888320ebe92c3094f2011b8656784ca42fe111
tree84b80c025132e7d4619709dd9134681c8b014fa2
parent31fa97bb12cd0a76352f133c2c3e2c9790288115
parentecfeb65f738d2f876e6b968d43b2c9f252439c40
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* '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