From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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: Ubuntu-5.0.0-8.9~43617
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0f851021c0f91e5073fa89f26b5ac68e23df8e11;p=mirror_ubuntu-disco-kernel.git

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