Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity
android_kernel_google_msm/kernel/power
History
Stephen Boyd 84d1c1a3a3 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 
Fix NR_IPI to be 7 instead of 6 because both googly and core add
an IPI.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	include/linux/wakelock.h
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h
2013-02-25 11:25:46 -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 consoleearlysuspend: Fix for 2.6.32 2013-02-20 01:32:22 -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 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 2013-02-25 11:25:46 -08:00
main.c PM: Enable early suspend through /sys/power/state 2013-02-20 01:32:12 -08:00
Makefile Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 2013-02-25 11:25:46 -08:00
power.h Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 2013-02-25 11:25:46 -08:00
poweroff.c
process.c PM: wakelock: Abort task freezing if a wake lock is held. 2013-02-20 01:32:21 -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 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 2013-02-25 11:25:46 -08:00
suspend_test.c
suspend_time.c power: Add option to log time spent in suspend 2012-04-09 13:53:09 -07:00
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 PM: wakelocks: Display wakelocks preventing suspend by default 2013-02-20 01:32:20 -08:00