Public Git Hosting - linux-2.6/cjktty.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 28cdac6 1051b9f)

commit	404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 6 Jan 2011 22:33:32 +0000 (6 22:33 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 6 Jan 2011 22:33:32 +0000 (6 22:33 +0000)
tree	99119edc53fdca73ed7586829b8ee736e09440b3	tree \| snapshot (tar.gz zip)
parent	28cdac6690cb113856293bf79b40de33dbd8f974	commit \| diff
parent	1051b9f0f9eab8091fe3bf98320741adf36b4cfa	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-cns3xxx/core.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clock-imx21.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clock-imx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clock-imx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/clock-imx31.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx3/clock-imx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/clock.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/sleep.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/Makefile	diff1 \|	diff2 \|	blob \| history

CJK support for tty framebuffer vt