Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Sep 2007 17:13:24 +0000 (10:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Sep 2007 17:13:24 +0000 (10:13 -0700)
commit01a6a7790e8e466584fc845f3cfc1770ffa1fee5
tree92183acab5a93d86836faf9554f04119f44e0dcb
parentae292dbd2e9385d4c63f0c7099ab73b60d1b26d3
parent99fa9844f0eed5582b5648f745204758b27db659
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