aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-09-04 20:21:16 -0600
committerPaul Walmsley <paul@pwsan.com>2011-09-04 20:21:16 -0600
commit876355014ce3a7ba8ca299522b215365b4a3fb61 (patch)
tree44b49303cd73a4f9f5a9fcc874db2e57901caf8b /arch
parentOMAP4: clock: re-enable previous clockdomain enable/disable sequence (diff)
parentOMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain (diff)
parentOMAP4: clock: fix compile warning (diff)
parentOMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[] (diff)
parentOMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup (diff)
downloadlinux-dev-876355014ce3a7ba8ca299522b215365b4a3fb61.tar.xz
linux-dev-876355014ce3a7ba8ca299522b215365b4a3fb61.zip
Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clock_fixes_3.1rc', 'missing_2430_musb_adds_terminator_fix_3.1rc' and 'pwrdm_clkdm_fixes_3.1rc' into prcm-fixes-a-3.1rc