]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfce8497642933cf3a1e10cb42e27c080c04277ec
tree2096324b947761a567dd451f33664f17ee1de2cd
parent745ccd86675ec831913082efc889241e9b8f1aae
parentc83d9608896d4e5a0d98e7af019fc9f623f9effa
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