Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Nov 2008 19:48:54 +0000 (11:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Nov 2008 19:48:54 +0000 (11:48 -0800)
commit4416662ece4e88aca687b28d7c059336b47478ba
tree6059210bf94c052f0450044fe48ddce017d3660d
parent3edac25f2e8ac8c2a84904c140e1aeb434e73e75
parent06190d8415219d9eef7d8f04b52a109e34575a76
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: 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