Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2007-06-11 11:31:43 -07:00

parent d5a169c879 c1183a3345

commit bb3d2dd723

10 changed files with 115 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/ide.h

View file

2

include/linux/pci_ids.h

View file