From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 4 Aug 2006 00:31:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v3.12-rc1~34326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e315544a61ac0fa21369e54e50a947ab899966e;p=kernel%2Fkernel-generic.git

Merge git://git./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
---

6e315544a61ac0fa21369e54e50a947ab899966e