Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110...
authorPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:43:05 +0000 (22:43 -0700)
committerPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:43:05 +0000 (22:43 -0700)
commit2d403fe03070b541cc93cfa915f6e6c592cf231c
tree530e0bf3a99a9aa93e0113a916fb7a547605ad2e
parent21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2
parentcc1226e7635011c7dd1e786770ed51ee751800f2
Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024

Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h