From: Linus Torvalds Date: Wed, 12 Nov 2008 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.28-rc5~60 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4416662ece4e88aca687b28d7c059336b47478ba;p=linux-2.6-omap-h63xx.git 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: struct device - replace bus_id with dev_name(), dev_set_name() iop-adma: use iop_paranoia() for debug BUG_ONs iop-adma: add a dummy read to flush next descriptor update --- 4416662ece4e88aca687b28d7c059336b47478ba