diff options
| author |   Paul Walmsley <paul@pwsan.com> | 2012-06-20 20:11:36 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-06-20 20:11:36 -0600 |
| commit | 07b3a13957aa250ff5b5409b8ed756b113544112 (patch) | |
| tree | 86fc625aa9cd9fb2817b88a3793d557a103444e4 /lib/mpi/mpiutil.c | |
| parent | ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data (diff) | |
| parent | ARM: OMAP: dsp: interface to control module functions (diff) | |
| parent | ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm (diff) | |
| parent | ARM: OMAP3: Move McBSP fck clock alias to hwmod data (diff) | |
| parent | ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain (diff) | |
| download | linux-dev-07b3a13957aa250ff5b5409b8ed756b113544112.tar.xz linux-dev-07b3a13957aa250ff5b5409b8ed756b113544112.zip | |
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c