Merged with mainline

author Tony Lindgren <tony@atomide.com>

Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)

committer Tony Lindgren <tony@atomide.com>

Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
author Tony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
committer Tony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
diff --cc drivers/char/Kconfig
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
		1	2
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history