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
..
alarmtimer.c	alarmtimer: Provide accessor to alarmtimer rtc device	2012-04-09 13:58:00 -07:00
clockevents.c	Revert "clockevents: Set noop handler in clockevents_exchange_device()"	2011-12-30 13:24:40 -08:00
clocksource.c	kernel-time: fix s/then/than/ spelling errors	2012-03-23 16:49:21 -07:00
jiffies.c
Kconfig	tick: Document TICK_ONESHOT config option	2012-03-31 12:45:43 +02:00
Makefile	HACK: time: Disable alarmtimer	2013-02-08 15:14:34 -08:00
ntp.c	time: remove no_sync_cmos_clock	2012-03-23 16:25:20 -07:00
posix-clock.c	kernel: Fix files explicitly needing EXPORT_SYMBOL infrastructure	2011-10-31 19:30:05 -04:00
tick-broadcast.c	tick: Fix the spurious broadcast timer ticks after resume	2012-04-19 21:27:50 +02:00
tick-common.c	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-internal.h	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-oneshot.c	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-sched.c	tick-sched: change the cpu that updates rq_stats	2013-02-08 15:14:29 -08:00
timecompare.c
timeconv.c
timekeeping.c	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 14:16:48 -07:00
timer_list.c
timer_stats.c	locking, timer_stats: Annotate table_lock as raw	2011-09-13 11:12:00 +02:00