Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Sep 2010 01:41:19 +0000 (18:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Sep 2010 01:41:19 +0000 (18:41 -0700)
commit77f890223338c890fc33972673d2bd3a53061570
treec2ed6ee220adc2c69816feaf4bcd6273f3dcdd97
parent4193d9163582b05e33aca3392e46649e5c3da8d1
parentcc60f8878eab892c03d06b10f389232b9b66bd83
Merge branch 'fixes' of git://git./linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmaengine: fix interrupt clearing for mv_xor
  missing inline keyword for static function in linux/dmaengine.h
  dma/shdma: move dereference below the NULL check