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

author Tony Lindgren <tony@atomide.com>

Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)

committer Tony Lindgren <tony@atomide.com>

Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)
author Tony Lindgren <tony@atomide.com>
Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)
committer Tony Lindgren <tony@atomide.com>
Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 28 Feb 2006 20:17:40 +0000 (12:17 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history