From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 11 Jun 2007 18:31:43 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v5.15~48411
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bb3d2dd72302ea3eefcc6738cdd39ed5864b62f8;p=mirror_ubuntu-kernels.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: Add the MCP73/77 support to PATA driver
  Add the PATA controller device ID to pci_ids.h for MCP73/MCP77.
  hpt366: disallow Ultra133 for HPT374
  ide: generic IDE PCI driver, add another device exception
  ide: HPA detect from resume
  it821x: RAID mode fixes
  serverworks: fix CSB6 tuning logic
  serverworks: remove crappy code
---

bb3d2dd72302ea3eefcc6738cdd39ed5864b62f8