| commit | f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 30 10:18:02 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 30 10:18:02 2008 -0700 |
| tree | 9191d024e747919eb05b83662b7f40f77d76dbe7 | |
| parent | 7536d7be7b718f8c5834cbcb7601816562e1b805 [diff] | |
| parent | a9b841e1a336822a25899ec8cdf70a55a6696ae7 [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: fix rpadlpar pci hotplug driver sysfs usage