Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)

committer Tony Lindgren <tony@atomide.com>

Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
author Tony Lindgren <tony@atomide.com>
Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
committer Tony Lindgren <tony@atomide.com>
Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
diff --cc drivers/media/video/Makefile
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history