summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-04-05 11:00:22 +0200
committerPaul Walmsley <paul@pwsan.com>2012-04-05 11:00:22 +0200
commita9dd31b744a033b4324c93cec4ecb4c74061e2cf (patch)
tree779ad05a3bb28ca575034c3c1b230f2d8c0c9bda /arch/arm
parentARM: OMAP3: clock data: fill in some missing clockdomains (diff)
parentARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL data (diff)
parentARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attached (diff)
parentARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks (diff)
parentARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions (diff)
parentARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_swit... (diff)
downloadlinux-a9dd31b744a033b4324c93cec4ecb4c74061e2cf.tar.xz
linux-a9dd31b744a033b4324c93cec4ecb4c74061e2cf.zip
Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_a2_3.4rc' and 'powerdomain_fixes_a_3.4rc' into omap-fixes-a2-for-3.4rc-branch