]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit97f657883a395364183feb78f3b2bf9e3b1f000a
tree546492b849c1113ac6889395c353ae577860c7fd
parent667de0d63c0265263fab6b79b375a0490d87cfa0
parent82d6aa161c2adfe6878021e91519a185beb7a7f4
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