| commit | b52e2a6d6d05421dea6b6a94582126af8cd5cca2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 28 11:23:50 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 28 11:23:50 2010 -0800 |
| tree | e595ebd22ddd609fdbeb15c889b495eb1cebdd40 | |
| parent | bec41d5b8417ccb98e4752affa24e1dc563d99f9 [diff] | |
| parent | 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf [diff] |
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: PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c