aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@g5.osdl.org> 2006-03-25 20:31:32 -0800
committerGravatar Linus Torvalds <torvalds@g5.osdl.org> 2006-03-25 20:31:32 -0800
commit36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91 (patch)
tree163d637dfda12eba3f8822d3b2941869b2d0ba00 /drivers/block/floppy.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion (diff)
downloadlinux-36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91.tar.gz
linux-36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91.tar.bz2
linux-36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion [SERIAL] amba-pl010: Remove accessor macros [SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI) [SERIAL] icom: select FW_LOADER
Diffstat (limited to 'drivers/block/floppy.c')
0 files changed, 0 insertions, 0 deletions