From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 11 Sep 2007 17:13:24 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v3.12-rc1~26959
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01a6a7790e8e466584fc845f3cfc1770ffa1fee5;p=kernel%2Fkernel-generic.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: irq and pci_ids patch for Intel Tolapai
  PCI: unhide SMBus on Compaq Deskpro EP 401963-001 motherboard
  PCI: Remove __devinit from pcibios_get_irq_routing_table
  PCI: remove devinit from pci_read_bridge_bases
  PCI AER: fix warnings when PCIEAER=n
---

01a6a7790e8e466584fc845f3cfc1770ffa1fee5