Merge branch 'twl4030-mfd' into for-2.6.33

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)
diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge
diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge
diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge
diff --cc include/linux/i2c/twl4030.h
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)
		1	2
arch/arm/mach-omap2/board-3430sdp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom2.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl4030.h	patch \|	diff1 \|	diff2 \|	blob \| history