| commit | 6e315544a61ac0fa21369e54e50a947ab899966e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Aug 03 17:31:15 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Aug 03 17:31:15 2006 -0700 |
| tree | f21f3c381fe3202a85828cd3020a48847aeafb05 | |
| parent | c31ca59e25f82879644088c97fe9cffbaa292786 [diff] | |
| parent | 2131ca8915ae545c596f94e75b692be2811d9c03 [diff] |
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