summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLen Brown2006-12-16 06:59:38 +0100
committerLen Brown2006-12-16 06:59:38 +0100
commit7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (patch)
treebcffffeb768b904fca87f026e105bac5ecadd776 /kernel/power
parentPull trivial into test branch (diff)
downloadkernel-qcow2-linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.tar.gz
kernel-qcow2-linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.tar.xz
kernel-qcow2-linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.zip
ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
0 files changed, 0 insertions, 0 deletions