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
..
autoprobe.c
chip.c	genirq: chip: set pending only for edge interrupts	2013-01-09 15:40:54 -08:00
debug.h
devres.c
dummychip.c
generic-chip.c
handle.c
internals.h
irqdesc.c	genirq: export handle_edge_irq() and irq_to_desc()	2012-05-15 08:10:07 -07:00
irqdomain.c
Kconfig
Makefile
manage.c	genirq: Add irq_set_pending	2013-02-08 15:04:34 -08:00
migration.c
pm.c	Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4	2013-02-25 11:25:46 -08:00
proc.c
resend.c
settings.h
spurious.c