Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2...
authorPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000 (22:43 -0700)
committerPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000 (22:43 -0700)
commita08572ae529b1e8de12393eeced661feae8fd44c
treee9b48848ab72c953d778832336eb8e1d43abdc8d
parent2d403fe03070b541cc93cfa915f6e6c592cf231c
parentc0718df4d666cc5fd8837ac93c82995a17bfdbf5
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
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/smartreflex.c
arch/arm/plat-omap/include/plat/omap_hwmod.h