8ac8c2a84904c140e1aeb434e73e75
parent 06190d8415219d9eef7d8f04b52a109e34575a76
author Linus Torvalds <torvalds@linux-foundation.org> 1226519334 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226519334 -0800

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
Ë