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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  qd65xx: fix PIO mode selection
  sis5513: adding PCI-ID
This commit is contained in:
Linus Torvalds 2007-07-08 12:14:27 -07:00
commit fe5a2de17e
3 changed files with 3 additions and 2 deletions