android_kernel_google_msm/kernel/power
Colin Cross 9fd5fc24ec power: wakelock: use get_xtime_and_monotonic_and_sleep_offset in get_expired_time
Change-Id: I6ebe6b954b2ff328d46898d683650dafb9c4fe74
Signed-off-by: Erik Gilling <konkers@android.com>
(cherry picked from commit 28e23cf73c26d2bb13451804e328797a55f471e4)

Conflicts:

	kernel/power/wakelock.c
2013-02-20 01:32:16 -08:00
..
block_io.c
console.c PM / VT: Cleanup #if defined uglyness and fix compile error 2011-10-16 23:28:51 +02:00
consoleearlysuspend.c PM: earlysuspend: Add console switch when user requested sleep state changes. 2013-02-20 01:31:52 -08:00
earlysuspend.c power: fix lcd resume taking long time with an ongoing file copy 2013-02-20 01:32:14 -08:00
fbearlysuspend.c framebuffer: add a pollable sysfs entry for display status 2013-02-20 01:32:14 -08:00
hibernate.c PM / Sleep: Move disabling of usermode helpers to the freezer 2012-03-28 23:30:21 +02:00
Kconfig PM: Add user-space wake lock api. 2013-02-20 01:32:11 -08:00
main.c PM: Enable early suspend through /sys/power/state 2013-02-20 01:32:12 -08:00
Makefile PM: Add user-space wake lock api. 2013-02-20 01:32:11 -08:00
power.h power: fix lcd resume taking long time with an ongoing file copy 2013-02-20 01:32:14 -08:00
poweroff.c
process.c power: fix lcd resume taking long time with an ongoing file copy 2013-02-20 01:32:14 -08:00
qos.c PM / QoS: add pm_qos_update_request_timeout() API 2012-03-28 23:31:24 +02:00
snapshot.c Power management updates for 3.4 2012-03-21 10:15:51 -07:00
suspend.c power: fix lcd resume taking long time with an ongoing file copy 2013-02-20 01:32:14 -08:00
suspend_test.c
swap.c PM / Hibernate: fix the number of pages used for hibernate/thaw buffering 2012-04-24 23:53:28 +02:00
user.c PM / Sleep: Move disabling of usermode helpers to the freezer 2012-03-28 23:30:21 +02:00
userwakelock.c PM: Add user-space wake lock api. 2013-02-20 01:32:11 -08:00
wakelock.c power: wakelock: use get_xtime_and_monotonic_and_sleep_offset in get_expired_time 2013-02-20 01:32:16 -08:00