From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Apr 2013 16:00:45 +0000 (+0200)
Subject: Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git.kernel.org/pub... 
X-Git-Tag: v3.10-rc1~126^2~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8bd2bcf320cfd0e7118da61d186c8466a247ef62;p=linux-2.6-block.git

Merge tag 'omap-for-v3.10/fixes-non-critical-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

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

8bd2bcf320cfd0e7118da61d186c8466a247ef62
diff --cc arch/arm/boot/dts/snowball.dts
index b095e85d93c8,d3ec32f6b790..db5db24fd544
--- a/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";