tree 546492b849c1113ac6889395c353ae577860c7fd
parent 1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c
parent 4660897e6c2daa198fc8e3f47ae2a4aef69c80b0
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1183922067 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1183922067 -0700

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