Merge remote-tracking branch 'maz/local_timers-v3.3-rc4' into android-t114-3.4-rebased
Conflicts:
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
arch/arm/mach-msm/timer.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/smp-r8a7779.c
arch/arm/mach-shmobile/smp-sh73a0.c
arch/arm/mach-shmobile/timer.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/timer.c
arch/arm/mach-ux500/timer.c
arch/arm/mach-vexpress/ct-ca9x4.c
Change-Id: Id65fd2a5994e4b22cd682952b8f71f8b33b73823
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>