Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)

committer Tony Lindgren <tony@atomide.com>

Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
author Tony Lindgren <tony@atomide.com>
Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
committer Tony Lindgren <tony@atomide.com>
Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history