summaryrefslogtreecommitdiff
path: root/net/rose
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-25 20:21:57 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-25 20:21:57 -0800
commit11ee29577cc1637f94d903a6ea322cf1ed8ce1b3 (patch)
treec26f34df84f184efe9d5e6d9e657b1fe8b598470 /net/rose
parentc2f68ad3b59d7015bf6fb0037ee0b5f2331aed28 (diff)
parentdeffca117b90dadec395c0cf3ee816de27dfe2fd (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: cmd64x: fix hwif->chipset setup MAINTAINERS: update ide-cd entry ide-cd: fix 'ireason' reporting in cdrom_pc_intr() ide-cd: fix error message in cdrom_pc_intr() ide-cd: add error message for DMA error to cdrom_read_intr() ide-cd: fix error messages in cdrom_write_intr() ide-cd: add missing 'ireason' masking to cdrom_write_intr() ide-cd: fix error messages in cdrom_{read,write}_check_ireason() ide-cd: use ide_cd_release() in ide_cd_probe() ide-cd: fix ACER/AOpen 24X CDROM speed reporting on big-endian machines ide-cd: fix SAMSUNG CD-ROM SCR-3231 quirk drivers/ide/: Spelling fixes
Diffstat (limited to 'net/rose')
0 files changed, 0 insertions, 0 deletions