| commit | 2d403fe03070b541cc93cfa915f6e6c592cf231c | [log] [tgz] |
|---|---|---|
| author | Paul Walmsley <paul@pwsan.com> | Thu Mar 10 22:43:05 2011 -0700 |
| committer | Paul Walmsley <paul@pwsan.com> | Thu Mar 10 22:43:05 2011 -0700 |
| tree | 530e0bf3a99a9aa93e0113a916fb7a547605ad2e | |
| parent | 21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 [diff] | |
| parent | cc1226e7635011c7dd1e786770ed51ee751800f2 [diff] |
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