From: Linus Torvalds Date: Sat, 21 Apr 2007 05:58:16 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: v2.6.21~36 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f851021c0f91e5073fa89f26b5ac68e23df8e11;p=linux-2.6 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: 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 --- 0f851021c0f91e5073fa89f26b5ac68e23df8e11