tree c01a0eb7355cb00d6db27f222559cd8bbe7c7bb3
parent 3dbfd0801bbbaf2800d7497d83d743a614430e82
parent 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009
author Linus Torvalds <torvalds@linux-foundation.org> 1211939279 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211939279 -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:
  pciehp: add message about pciehp_slot_with_bus option
  pci hotplug core: add check of duplicate slot name
  pciehp: move msleep after power off
  pciehp: poll cmd completion if hotplug interrupt is disabled
  pciehp: fix slow probing
  pciehp: fix NULL dereference in interrupt handler
  shpchp: add message about shpchp_slot_with_bus option
  PCI: don't enable ASPM on devices with mixed PCIe/PCI functions