diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 11:26:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 11:26:01 -0800 |
| commit | b1c3c3ebf70548bb182d570b79a3f21045cd30e5 (patch) | |
| tree | ad70af0d0fa33b737ff1ae28e59761865b24bdae /fs/ocfs2/heartbeat.c | |
| parent | 87baa2bb904ed46f872385fe430b6cfb80967835 (diff) | |
| parent | 6497dcffe07b7c3d863f9899280c4f6eae999161 (diff) | |
| download | linux-b1c3c3ebf70548bb182d570b79a3f21045cd30e5.tar.gz linux-b1c3c3ebf70548bb182d570b79a3f21045cd30e5.tar.bz2 linux-b1c3c3ebf70548bb182d570b79a3f21045cd30e5.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:
ioat: fix 'ack' handling, driver must ensure that 'ack' is zero
dmaengine: fix sparse warning
fsldma: do not cleanup descriptors in hardirq context
dmaengine: add driver for Freescale MPC85xx DMA controller
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
0 files changed, 0 insertions, 0 deletions