Merge ../linux-2.6

author Tony Lindgren <tony@atomide.com>

Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)

committer Tony Lindgren <tony@atomide.com>

Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
author Tony Lindgren <tony@atomide.com>
Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
committer Tony Lindgren <tony@atomide.com>
Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
diff --cc Makefile
Simple merge
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history