From: Linus Torvalds Date: Mon, 3 Jan 2011 19:48:54 +0000 (-0800) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx X-Git-Tag: v2.6.37~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45fa563a62c908d0e9a581d4f091fed6371ebd0;p=pandora-kernel.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: provide dummy functions for DMA_ENGINE=n mv_xor: fix race in tasklet function --- d45fa563a62c908d0e9a581d4f091fed6371ebd0 Reading git-diff-tree failed