Merge with ../linux-2.6

author Tony Lindgren <tony@atomide.com>

Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)

committer Tony Lindgren <tony@atomide.com>

Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
author Tony Lindgren <tony@atomide.com>
Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
committer Tony Lindgren <tony@atomide.com>
Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history