diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:31:29 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:31:29 -0800 |
commit | 8328258e745b80290534c9ab5bede6cd8340ea75 (patch) | |
tree | b1904eb2841f9805e1bf6d524963ad6d9ec583e1 /drivers/ide/ide-floppy.c | |
parent | 205c911da322908abe127b96d2ef2a4a2aa5109a (diff) | |
parent | a715dfc7b9ef15ed5b398b185bd84cc015ff37f6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
sdhci: release irq during suspend
sdhci: make isr tolerant of read errors
mmc: require explicit support for high-speed
ncpfs: make sure server connection survives a kill
Diffstat (limited to 'drivers/ide/ide-floppy.c')
0 files changed, 0 insertions, 0 deletions