Merge remote-tracking branch 'maz/timers-v3.4-rc4' into android-t114-3.4-rebased
authorVarun Wadekar <vwadekar@nvidia.com>
Thu, 21 Jun 2012 06:24:00 +0000 (11:24 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Thu, 21 Jun 2012 06:24:00 +0000 (11:24 +0530)
commitd39fa989e2353661c879279c88ccfecd0b4351f9
tree18fd69df1facf9e9ed63fd6fd908fa24a3cfa191
parentd8b0513f00a0c3fd648e6dc49b4f582acc075624
parentfb8a99f9f6bdc908cbbd2284cee80c709d9f7c03
Merge remote-tracking branch 'maz/timers-v3.4-rc4' into android-t114-3.4-rebased

Conflicts:
Documentation/devicetree/bindings/arm/arch_timer.txt
arch/arm/Kconfig
arch/arm/include/asm/arch_timer.h
arch/arm/kernel/arch_timer.c
arch/arm/kernel/smp.c

Change-Id: I37b071c41d3daf0dc09f0f4366e2269b9a2ee154
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Documentation/devicetree/bindings/arm/arch_timer.txt
arch/arm/include/asm/arch_timer.h
arch/arm/kernel/Makefile
arch/arm/kernel/arch_timer.c
arch/arm/kernel/smp.c
arch/arm/mach-vexpress/v2m.c