tree e9b48848ab72c953d778832336eb8e1d43abdc8d
parent 2d403fe03070b541cc93cfa915f6e6c592cf231c
parent c0718df4d666cc5fd8837ac93c82995a17bfdbf5
author Paul Walmsley <paul@pwsan.com> 1299822212 -0700
committer Paul Walmsley <paul@pwsan.com> 1299822212 -0700

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

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