diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-11 04:02:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-11 04:04:08 -0700 |
| commit | 56fecc7de9cfeb804d8ff51c481154bf3f6ccb6a (patch) | |
| tree | b2ecb1500d0dc9cc62480bf11f3234f8e3182127 /arch/arm/mach-tegra/sleep.S | |
| parent | 535409d9b37292257e22654e7b5246b913e51985 (diff) | |
| parent | 105612489bf59386b46b3f9f034e03f70e57aee6 (diff) | |
Merge branch 'omap/fixes-non-critical' into next/dt2
Merging in dependencies for the omap/dt branch.
* omap/fixes-non-critical:
ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
ARM: OMAP5: clock: No Freqsel on OMAP5 devices too
ARM: OMAP5: Make errata i688 workaround available
ARM: OMAP5: Update SAR memory layout for WakeupGen
ARM: OMAP5: Update SAR RAM base address
ARM: OMAP5: Reuse prm read_inst/write_inst
ARM: OMAP5: prm: Allow prm init to succeed
ARM: OMAP5: timer: Update the clocksource name as per clock data
ARM: OMAP5: Update SOC id detection code for ES2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
0 files changed, 0 insertions, 0 deletions