]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (22:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:33:32 +0000 (22:33 +0000)
commit5e2c5b13070990081e991e3cbabf8fab659aa481
tree99119edc53fdca73ed7586829b8ee736e09440b3
parent88dea63624a84ceecdba17923d40d33fcb0d9475
parent6254d45de2135377082af8fa68074f190848a2b3
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