Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)

committer Tony Lindgren <tony@atomide.com>

Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)
author Tony Lindgren <tony@atomide.com>
Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)
committer Tony Lindgren <tony@atomide.com>
Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)
diff --cc Makefile
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
diff --cc drivers/net/smc91x.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 4 Nov 2008 01:17:16 +0000 (17:17 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	patch \|	diff1 \|	diff2 \|	blob \| history