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

..

events

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

2013-02-25 11:25:46 -08:00

define_trace.h

Revert "tracing: Include module.h in define_trace.h"

2011-10-31 19:32:35 -04:00

ftrace.h

coresight: enable stm logging for ftrace events and printk

2013-02-08 15:14:31 -08:00

syscall.h

…