| commit | bb3d2dd72302ea3eefcc6738cdd39ed5864b62f8 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 11 Jun 2007 18:31:43 +0000 (11 11:31 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 11 Jun 2007 18:31:43 +0000 (11 11:31 -0700) | ||
| tree | 94aea714ae4b2b39e05aeb32d0dffccc8a15a8a8 | treesnapshot (tar.gz zip) |
| parent | d5a169c87967981d06616c3c99408bc40ec9f618 | commitdiff |
| parent | c1183a3345f2e553fa0907a453cbb311c7e1698c | commitdiff |
Merge /pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: Add the MCP73/77 support to PATA driver
Add the PATA controller device ID to pci_ids.h for MCP73/MCP77.
hpt366: disallow Ultra133 for HPT374
ide: generic IDE PCI driver, add another device exception
ide: HPA detect from resume
it821x: RAID mode fixes
serverworks: fix CSB6 tuning logic
serverworks: remove crappy code
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: Add the MCP73/77 support to PATA driver
Add the PATA controller device ID to pci_ids.h for MCP73/MCP77.
hpt366: disallow Ultra133 for HPT374
ide: generic IDE PCI driver, add another device exception
ide: HPA detect from resume
it821x: RAID mode fixes
serverworks: fix CSB6 tuning logic
serverworks: remove crappy code