Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Oct 2008 02:31:34 +0000 (19:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Oct 2008 02:31:34 +0000 (19:31 -0700)
commit3a2c5dad6c4d4551effba477f4f45fa5feb1293f
tree1e1f1ab67279c46c3e6aed1c4041880f58ec5dae
parent2242d5eff17cf91110a3c44747f9f2e1a938cbda
parenta491913ff22c2b69d937d14296db6fa34dbff068
Merge branch 'for-linus' of git://git./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