(cherry picked from commit ec81142a98488552276a425d6363533368d02025) Conflicts: include/linux/wakelock.h Change-Id: I185d58274d2b1d69447981b669f5921c74f73a00
Change-Id: Icaad02fe1e8856fdc2e4215f380594a5dde8e002 Signed-off-by: Arve Hjønnevåg <arve@android.com> (cherry picked from commit e9911f4efd) Conflicts: kernel/power/Kconfig
e9911f4efd