Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <[email protected]>
Sun, 8 Jul 2007 19:14:27 +0000 (12:14 -0700)
committerLinus Torvalds <[email protected]>
Sun, 8 Jul 2007 19:14:27 +0000 (12:14 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  qd65xx: fix PIO mode selection
  sis5513: adding PCI-ID


Trivial merge