| commit | 9b8f013a8361b05edf511f04fe93b36310b73806 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 11:00:37 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 11:00:37 2009 -0700 |
| tree | 1c23961d09cc4a47514a501b6f8a6a0f9290a7c2 | |
| parent | 9bcf73f48280ef8cd7f2e38e674da47c409b9906 [diff] | |
| parent | 94f81a47c4a7a2d7a16fcfdd6d81da381732c101 [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: SGI hotplug: do not use hotplug_slot_attr PCI hotplug: SGI hotplug: fix build failure