Auto-tag integration-2.6.39-20110310-018
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-018

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c