Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 05:58:10 +0000 (21:58 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 05:58:10 +0000 (21:58 -0800)
commit117430b1fa3ae0b0bd981226bdb0c5412729c1db
treef1209f5705d1ba55d88f5a1e17b82382c8b460d0
parent2695cf412f07f394587e7901cb3b4e9b66d25051
parent128bf5cb54dececc5209db65f8ef5d17d74244d9
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  pci: fix section mismatch warning
  PCI: aer: fix section mismatch warning
  pcie: fix section mismatch warning
  PCI: allow multiple calls to pcim_pin_device()