Update to 2.6.14

author Tony Lindgren <tony@atomide.com>

Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)

committer Tony Lindgren <tony@atomide.com>

Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)
author Tony Lindgren <tony@atomide.com>
Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)
committer Tony Lindgren <tony@atomide.com>
Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 3 Nov 2005 23:26:34 +0000 (15:26 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history