Merge branch 'twl4030-mfd' into for-2.6.33
Mark Brown [Tue, 10 Nov 2009 12:08:12 +0000 (12:08 +0000)]
1  2 
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-zoom2.c
include/linux/i2c/twl4030.h

Simple merge
Simple merge
Simple merge
Simple merge