diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 20:48:54 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 20:48:54 +0100 |
commit | 4416662ece4e88aca687b28d7c059336b47478ba (patch) | |
tree | 6059210bf94c052f0450044fe48ddce017d3660d /include | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
parent | dmaengine: struct device - replace bus_id with dev_name(), dev_set_name() (diff) | |
download | linux-4416662ece4e88aca687b28d7c059336b47478ba.tar.xz linux-4416662ece4e88aca687b28d7c059336b47478ba.zip |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions