Merge branch 'clksrc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:09:03 +0000 (18:09 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:09:03 +0000 (18:09 +0000)
commit58daf18cdcab550262a5f4681e1f1e073e21965a
tree2096324b947761a567dd451f33664f17ee1de2cd
parentaa312be1987d43216e72ffce42bccf6bf81f62ed
parent0af85dda39d9b673aca8c0ebae004ea70f3efc93
Merge branch 'clksrc' into devel

Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
12 files changed:
arch/arm/Kconfig
arch/arm/common/timer-sp.c
arch/arm/include/asm/system.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/smp.c
arch/arm/mach-realview/core.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-versatile/core.c
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-iop/time.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile