Alex Shi 80cd9be34a Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts:
	included wakeup_reason.h file of 57caa2ad5c in kernel/power/process.c

2017-10-13 23:14:45 +08:00

..

autosleep.c

…

console.c

…

hibernate.c

…

Kconfig

…

main.c

…

Makefile

…

power.h

…

poweroff.c

…

process.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-10-13 23:14:45 +08:00

qos.c

…

snapshot.c

…

suspend_test.c

…

suspend.c

…

swap.c

…

user.c

…

wakelock.c

…

wakeup_reason.c

…