Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)

committer Tony Lindgren <tony@atomide.com>

Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
author Tony Lindgren <tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
committer Tony Lindgren <tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
diff --cc Makefile
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history