tree f21f3c381fe3202a85828cd3020a48847aeafb05
parent c31ca59e25f82879644088c97fe9cffbaa292786
parent 2131ca8915ae545c596f94e75b692be2811d9c03
author Linus Torvalds <torvalds@g5.osdl.org> 1154651475 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154651475 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PNP: Add missing casts in printk() arguments
  PCI: docking station: remove dock uevents
  PCI: Unhide the SMBus on Asus PU-DLS
  PCI Hotplug: add acpiphp to MAINTAINERS
  PCI: pci/search: EXPORTs cannot be __devinit
  PCIE: cleanup on probe error
  pcie: fix warnings when CONFIG_PM=n