Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)

committer Tony Lindgren <tony@atomide.com>

Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
author Tony Lindgren <tony@atomide.com>
Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
committer Tony Lindgren <tony@atomide.com>
Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
diff --cc Makefile
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 16 Jan 2008 16:20:47 +0000 (08:20 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history