Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub...

From Tony Lindgren <tony@atomide.com>:

Non critical omap fixes for v3.10 merge window. A big chunk
of these fixes are needed to support omap5 es2 version that includes
PM features while the earlier version es1 did not.

* tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  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

Contains an update to 3.9-rc5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/dbx5x0.dtsi
Simple merge

diff --cc arch/arm/boot/dts/href.dtsi
Simple merge

diff --cc arch/arm/boot/dts/snowball.dts
index b095e85d93c8e1e3f362b92d934b745cf333ada8,d3ec32f6b79073fc7171f966f47257cac86aabfb..db5db24fd54407233b42aa1cc4b202e589eabdd0
--- 1/arch/arm/boot/dts/snowball.dts
--- 2/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@@ -298,11 -298,7 +298,11 @@@
                                };
                        };
  
-                       ab8500@5 {
+                       ab8500 {
 +                              ab8500-gpio {
 +                                      compatible = "stericsson,ab8500-gpio";
 +                              };
 +
                                ab8500-regulators {
                                        ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
                                                regulator-name = "V-DISPLAY";