linux-uconsole/kernel/power
Mark Brown 943550a24c Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android
Conflicts:
	arch/arm64/include/asm/cmpxchg.h
	drivers/cpufreq/cpufreq.c
	include/net/tcp.h
	net/ipv4/ping.c
	net/ipv4/sysctl_net_ipv4.c
	net/netfilter/xt_qtaguid.c
2014-03-11 09:47:53 +00:00
..
autosleep.c PM / Sleep: avoid 'autosleep' in shutdown progress 2013-07-28 16:30:21 -07:00
block_io.c block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
console.c PM: make VT switching to the suspend console optional v3 2013-02-20 01:33:41 +01:00
hibernate.c Power management updates for 3.6 2012-07-22 13:36:52 -07:00
Kconfig Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android 2013-07-19 10:42:11 +01:00
main.c suspend: enable freeze timeout configuration through sys 2013-02-09 22:32:48 +01:00
Makefile Power: add an API to log wakeup reasons 2014-02-20 02:43:15 +00:00
power.h PM / Hibernate: Enable suspend to both for in-kernel hibernation. 2012-07-01 13:31:22 +02:00
poweroff.c power/sysrq: fix inconstistent help message of sysrq key 2013-04-30 17:04:10 -07:00
process.c freezer: shorten freezer sleep time using exponential backoff 2013-07-01 15:40:31 -07:00
qos.c PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout() 2013-08-20 08:43:05 -07:00
snapshot.c PM / hibernate: Avoid overflow in hibernate_preallocate_memory() 2013-12-04 10:56:58 -08:00
suspend.c PM / Suspend: Print wall time at suspend entry and exit 2013-07-01 13:40:48 -07:00
suspend_test.c driver-core: constify data for class_find_device() 2013-02-06 12:18:56 -08:00
suspend_time.c power: Add option to log time spent in suspend 2013-07-01 13:34:58 -07:00
swap.c PM / Hibernate: use rb_entry 2012-11-15 00:37:08 +01:00
user.c Make wait_for_device_probe() also do scsi_complete_async_scans() 2012-07-18 18:15:46 -07:00
wakelock.c Revert "PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock" 2014-01-13 16:36:47 -08:00
wakeup_reason.c POWER: fix compile warnings in log_wakeup_reason 2014-02-21 04:16:10 +00:00