aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock2430_data.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-03-10 22:41:28 -0700
committerPaul Walmsley <paul@pwsan.com>2011-03-10 22:41:28 -0700
commit21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 (patch)
treeec84b5e9ab22958a9bfa6e9897e706fc9540dcc0 /arch/arm/mach-omap2/clock2430_data.c
parentOMAP2+: powerdomain: add pwrdm_can_ever_lose_context() (diff)
parentOMAP2+: omap_device/clock: Do not expect an entry in clkdev for opt_clks (diff)
parentMMC: omap_hsmmc: enable interface clock before calling mmc_host_enable() (diff)
parentOMAP2+: clockdomain: add flag that will block autodeps from being added for a clockdomain (diff)
parentomap2/3: dmtimer: Enable autoidle (diff)
parentOMAP4: clockdomain: Remove pr_errs' stating unsupported wkdep (diff)
parentOMAP2xxx: clock data: clean up some comments (diff)
parentMAINTAINERS: add entry for OMAP powerdomain/clockdomain per-SoC layer support (diff)
parentOMAP3: hwmod data: Remove masters port links for interconnects. (diff)
parentOMAP3: wdtimer: Fix CORE idle transition (diff)
downloadlinux-dev-21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2.tar.xz
linux-dev-21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2.zip
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024