Merge remote-tracking branch 'maz/local_timers-v3.3-rc4' into android-t114-3.4-rebased
authorVarun Wadekar <vwadekar@nvidia.com>
Thu, 21 Jun 2012 04:47:10 +0000 (09:47 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Thu, 21 Jun 2012 04:48:12 +0000 (09:48 +0530)
commitadf8e216a6072cf4b1a4bb3fe4a3e047a16a3303
tree77ec68689c9375d524e952fcab94c4332435b78c
parent9edeaa7b227ac3a4d38a8a41914a44d2d8173170
parente3b1d3dc90cbf0602a69687f48cc1a07574a266e
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>
arch/arm/Kconfig
arch/arm/kernel/Makefile
arch/arm/kernel/smp.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-ux500/timer.c