android_kernel_google_msm/kernel/power
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
consoleearlysuspend.c consoleearlysuspend: Fix for 2.6.32 2013-02-20 01:32:22 -08:00
earlysuspend.c
fbearlysuspend.c
hibernate.c
Kconfig Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 2013-02-25 11:25:46 -08:00
main.c
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
qos.c
snapshot.c
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
swap.c
user.c
userwakelock.c
wakelock.c