| commit | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sat Dec 16 00:59:38 2006 -0500 |
| committer | Len Brown <len.brown@intel.com> | Sat Dec 16 00:59:38 2006 -0500 |
| tree | bcffffeb768b904fca87f026e105bac5ecadd776 | |
| parent | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc [diff] |
ACPI: fix git automerge failure Signed-off-by: Len Brown <len.brown@intel.com>