Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
commit0f851021c0f91e5073fa89f26b5ac68e23df8e11
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:58:16 +0000 (20 22:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:58:16 +0000 (20 22:58 -0700)
tree23c3e56c76361386c56ddf4ffcecad17bd8c004d
parentea8df8c5e609a53f4d03d133baea9561412f4303
parent8929fea39cb0ab3e455fe00e7eb6806c32155cd2
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide/Kconfig: add missing range check for IDE_MAX_HWIFS
  hpt366: fix kernel oops with HPT302N
  ide/pci/delkin_cb.c: add new PCI ID