Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)

committer Tony Lindgren <tony@atomide.com>

Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
author Tony Lindgren <tony@atomide.com>
Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
committer Tony Lindgren <tony@atomide.com>
Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
diff --cc Makefile
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history