| commit | 597049ccd729e80c5eff7d907beeb58d908aac6f | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 30 Jan 2007 16:41:27 +0000 (30 08:41 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 30 Jan 2007 16:41:27 +0000 (30 08:41 -0800) | ||
| tree | 49e6ffd8838ed00923876fa3b1ed8a145444fd1a | treesnapshot (tar.gz zip) |
| parent | d3143e71a95fe504c3d2d4a3b7aac126a588b1ac | commitdiff |
| parent | e0b874df14052489e6408125903dba96b4dd7baa | commitdiff |
Merge /pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S
ide: unregister idepnp driver on unload
ide: add missing __init tags to IDE PCI host drivers
ia64: add pci_get_legacy_ide_irq()
ide/generic: Jmicron has its own drivers now
atiixp.c: add cable detection support for ATI IDE
atiixp.c: sb600 ide only has one channel
atiixp.c: remove unused code
jmicron: fix warning
ide: update MAINTAINERS entry
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S
ide: unregister idepnp driver on unload
ide: add missing __init tags to IDE PCI host drivers
ia64: add pci_get_legacy_ide_irq()
ide/generic: Jmicron has its own drivers now
atiixp.c: add cable detection support for ATI IDE
atiixp.c: sb600 ide only has one channel
atiixp.c: remove unused code
jmicron: fix warning
ide: update MAINTAINERS entry