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

author Tony Lindgren <tony@atomide.com>

Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)

committer Tony Lindgren <tony@atomide.com>

Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)
author Tony Lindgren <tony@atomide.com>
Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)
committer Tony Lindgren <tony@atomide.com>
Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)
diff --cc Makefile
Simple merge
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
diff --cc drivers/media/video/Makefile
Simple merge
diff --cc init/do_mounts.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 26 May 2006 22:17:19 +0000 (15:17 -0700)
		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
drivers/media/video/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/do_mounts.c	patch \|	diff1 \|	diff2 \|	blob \| history