diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 06:59:38 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 06:59:38 +0100 |
| commit | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (patch) | |
| tree | bcffffeb768b904fca87f026e105bac5ecadd776 /kernel/power/disk.c | |
| parent | Pull trivial into test branch (diff) | |
| download | linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.tar.xz linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.zip | |
ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/disk.c')
0 files changed, 0 insertions, 0 deletions