Merge branch 'devel-stable' into devel
commit404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (6 22:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (6 22:33 +0000)
tree99119edc53fdca73ed7586829b8ee736e09440b3
parent28cdac6690cb113856293bf79b40de33dbd8f974
parent1051b9f0f9eab8091fe3bf98320741adf36b4cfa
Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
20 files changed:
arch/arm/Kconfig
arch/arm/kernel/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/mach-cns3xxx/core.h
arch/arm/mach-davinci/time.c
arch/arm/mach-imx/clock-imx21.c
arch/arm/mach-imx/clock-imx25.c
arch/arm/mach-imx/clock-imx27.c
arch/arm/mach-mx3/clock-imx31.c
arch/arm/mach-mx3/clock-imx35.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
arch/arm/mach-pxa/sleep.S
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mm/Kconfig
drivers/pcmcia/Makefile