Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 8 Jul 2007 19:14:27 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 8 Jul 2007 19:14:27 +0000 (12:14 -0700)
commitfe5a2de17e65d82b9d502da80ccb5a689d03fdd2
tree546492b849c1113ac6889395c353ae577860c7fd
parent1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c
parent4660897e6c2daa198fc8e3f47ae2a4aef69c80b0
Merge /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