cfee47f99b
Conflicts: kernel/power/disk.c |
||
---|---|---|
.. | ||
console.c | ||
disk.c | ||
Kconfig | ||
main.c | ||
Makefile | ||
pm.c | ||
power.h | ||
poweroff.c | ||
process.c | ||
snapshot.c | ||
swap.c | ||
swsusp.c | ||
user.c |
cfee47f99b
Conflicts: kernel/power/disk.c |
||
---|---|---|
.. | ||
console.c | ||
disk.c | ||
Kconfig | ||
main.c | ||
Makefile | ||
pm.c | ||
power.h | ||
poweroff.c | ||
process.c | ||
snapshot.c | ||
swap.c | ||
swsusp.c | ||
user.c |