From: Linus Torvalds Date: Thu, 30 Sep 2010 01:41:19 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx X-Git-Tag: v3.0~3234 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77f890223338c890fc33972673d2bd3a53061570;p=platform%2Fkernel%2Flinux-amlogic.git 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 --- 77f890223338c890fc33972673d2bd3a53061570