Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)

committer Tony Lindgren <tony@atomide.com>

Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
author Tony Lindgren <tony@atomide.com>
Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
committer Tony Lindgren <tony@atomide.com>
Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history