Merge with /home/tmlind/src/kernel/linux-2.6

author Tony Lindgren <tony@atomide.com>

Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)

committer Tony Lindgren <tony@atomide.com>

Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)
author Tony Lindgren <tony@atomide.com>
Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)
committer Tony Lindgren <tony@atomide.com>
Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)
diff --cc Makefile
Simple merge
diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge
diff --cc drivers/input/keyboard/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 20 Oct 2005 15:13:36 +0000 (18:13 +0300)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/vmlinux.lds.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history