diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 17:38:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 17:38:55 +0200 |
| commit | 07fe944e87d79f8d7e1b090913fe9f2ace78f41d (patch) | |
| tree | b20a3576d61d4dc3d89cf47515a786b31fd997d6 /drivers/ide/ide-floppy.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | dmaengine: ack to flags: make use of the unused bits in the 'ack' field (diff) | |
| download | linux-07fe944e87d79f8d7e1b090913fe9f2ace78f41d.tar.xz linux-07fe944e87d79f8d7e1b090913fe9f2ace78f41d.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: ack to flags: make use of the unused bits in the 'ack' field
iop-adma: remove the workaround for missed interrupts on iop3xx
async_tx: kill ->device_dependency_added
async_tx: fix multiple dependency submission
fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
Diffstat (limited to 'drivers/ide/ide-floppy.c')
0 files changed, 0 insertions, 0 deletions