Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)

committer Tony Lindgren <tony@atomide.com>

Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)
author Tony Lindgren <tony@atomide.com>
Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)
committer Tony Lindgren <tony@atomide.com>
Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)
diff --cc Makefile
Simple merge
diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge
diff --cc drivers/hwmon/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 13 Mar 2009 16:39:28 +0000 (09:39 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history