463e7c7cf9
Conflicts: drivers/acpi/ec.c |
||
---|---|---|
.. | ||
boot.c | ||
cstate.c | ||
earlyquirk.c | ||
Makefile | ||
processor.c | ||
sleep.c | ||
wakeup.S |
463e7c7cf9
Conflicts: drivers/acpi/ec.c |
||
---|---|---|
.. | ||
boot.c | ||
cstate.c | ||
earlyquirk.c | ||
Makefile | ||
processor.c | ||
sleep.c | ||
wakeup.S |