diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 00:59:38 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:59:38 -0500 |
| commit | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (patch) | |
| tree | bcffffeb768b904fca87f026e105bac5ecadd776 /include/linux/apm_bios.h | |
| parent | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (diff) | |
ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/apm_bios.h')
0 files changed, 0 insertions, 0 deletions