tree 1e1f1ab67279c46c3e6aed1c4041880f58ec5dae
parent 2242d5eff17cf91110a3c44747f9f2e1a938cbda
parent a491913ff22c2b69d937d14296db6fa34dbff068
author Linus Torvalds <torvalds@linux-foundation.org> 1224815494 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224815494 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: remove unused resource assignment in pci_read_bridge_bases()
  PCI hotplug: shpchp: message refinement
  PCI hotplug: shpchp: replace printk with dev_printk
  PCI: add routines for debugging and handling lost interrupts
  PCI hotplug: pciehp: message refinement
  PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems
  PCI hotplug: cpqphp: fix kernel NULL pointer dereference