summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-26 05:21:57 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-26 05:21:57 +0100
commit11ee29577cc1637f94d903a6ea322cf1ed8ce1b3 (patch)
treec26f34df84f184efe9d5e6d9e657b1fe8b598470 /net
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff)
parentcmd64x: fix hwif->chipset setup (diff)
downloadlinux-11ee29577cc1637f94d903a6ea322cf1ed8ce1b3.tar.xz
linux-11ee29577cc1637f94d903a6ea322cf1ed8ce1b3.zip
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')
0 files changed, 0 insertions, 0 deletions