From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 5 Nov 2007 22:08:00 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d66f151ac7cb5162f201fe2996c6e01f0323f37;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Add Kconfig option to disable deprecated pci_find_* API
  PCI: pciserial_resume_one ignored return value of pci_enable_device
  PCI Hotplug: cpqhp_pushbutton_thread(): remove a pointless if() check
  PCI: make pci_match_device() static
  PCI: Remove 3 incorrect MSI quirks.
  PCI: Add MSI INTX_DISABLE quirks for ATI SB700/800 SATA and IXP SB400 USB
  PCI: Add quirk for devices which disable MSI when INTX_DISABLE is set.
  PCI: Add MSI quirk for ServerWorks HT1000 PCIX bridge.
  PCI: Revert "PCI: disable MSI by default on systems with Serverworks HT1000 chips"
---

5d66f151ac7cb5162f201fe2996c6e01f0323f37