| commit | 5606b7f925b36f25a6646bb93a0cf74981de3d28 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 12:17:03 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 12:17:03 2009 -0700 |
| tree | 4db5e43a4af178cad6b9090df7c6c0d95bba27d2 | |
| parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad [diff] | |
| parent | 9d911d7903926a65ef49ec671bacd86bcee5eb51 [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: acpiphp: don't store a pci_dev in acpiphp_func