diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:19:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:19:27 +1100 |
| commit | a8f7e9ee94aaec9a89f306876f998ea82c17d97b (patch) | |
| tree | 7184d24ee9c2ae07b475cf54b6c372e47052b434 /kernel | |
| parent | c763d64084fec619805d7d741fadcba88ae2151b (diff) | |
| parent | 47edff6884d4a08da144b27de468088f0c3820e7 (diff) | |
Merge remote branch 'acpi/test'
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions