| commit | bd99f5e17b317a6d342ffaf500e2a9fd632d2a22 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 12 17:12:36 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 12 17:12:36 2009 -0700 |
| tree | 83dfd8b181b9655b5d41dcce28f1034d42cf1d31 | |
| parent | 2ea3f868487dcee0bfd91055f1c42bb172efc507 [diff] | |
| parent | ad567ffb32f067b30606071eb568cf637fe42185 [diff] |
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: dma: fix ipu_idmac.c to not discard the last queued buffer ioatdma: fix "ioatdma frees DMA memory with wrong function" ipu_idmac: Use disable_irq_nosync() from within irq handlers. dmatest: fix max channels handling