From: Olof Johansson <olof@lixom.net>
Date: Fri, 19 Apr 2013 18:37:21 +0000 (-0700)
Subject: Merge branch 'omap/fixes-non-critical' into late/cleanup
X-Git-Tag: v3.10-rc1~62^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17ada81e4ed9525cc2344aceb2ecf360142eef50;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'omap/fixes-non-critical' into late/cleanup

* 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
---

17ada81e4ed9525cc2344aceb2ecf360142eef50