| commit | 5606b7f925b36f25a6646bb93a0cf74981de3d28 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 29 May 2009 19:17:03 +0000 (29 12:17 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 29 May 2009 19:17:03 +0000 (29 12:17 -0700) | ||
| tree | 4db5e43a4af178cad6b9090df7c6c0d95bba27d2 | treesnapshot (tar.gz zip) |
| parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad | commitdiff |
| parent | 9d911d7903926a65ef49ec671bacd86bcee5eb51 | commitdiff |
Merge branch 'for-linus' of git://git./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
* '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