diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:13:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:13:08 -0800 |
| commit | 7954d5cf39ee1ce9bb0a4b19fcf1924885a9cad1 (patch) | |
| tree | 3515ebb6ed3f15ead563ac3e30e30fd4b37992fb /drivers/net/bnx2x_main.c | |
| parent | 37f5fed55559a030c430550bcacec75e6a833f1b (diff) | |
| parent | 86528da229a448577a8401a17c295883640d336c (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:
i.MX31: framebuffer driver
i.MX31: Image Processing Unit DMA and IRQ drivers
dmaengine: add async_tx_clear_ack() macro
dmaengine: dma_issue_pending_all == nop when CONFIG_DMA_ENGINE=n
dmaengine: kill some dubious WARN_ONCEs
fsldma: print correct IRQ on mpc83xx
fsldma: check for NO_IRQ in fsl_dma_chan_remove()
dmatest: Use custom map/unmap for destination buffer
fsldma: use a valid 'device' for dma_pool_create
dmaengine: fix dependency chaining
Diffstat (limited to 'drivers/net/bnx2x_main.c')
0 files changed, 0 insertions, 0 deletions