---

yaml --- r: 313249 b: refs/heads/master c: e5d0f9f h: refs/heads/master i: 313247: 5c7ccc6 v: v3
git-mirror · Jul 2, 2012 · c220256 · c220256
1 parent 5250c77
commit c220256
Show file tree

Hide file tree

Showing 42 changed files with 548 additions and 1,577 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 059eab45637b23c661bb00514950e7a449d04b4b
+refs/heads/master: e5d0f9f57ef213c3a6e21a599c942c4eb7ca2729
diff --git a/trunk/Documentation/devicetree/bindings/arm/olimex.txt b/trunk/Documentation/devicetree/bindings/arm/olimex.txt
diff --git a/trunk/Documentation/devicetree/bindings/fb/mxsfb.txt b/trunk/Documentation/devicetree/bindings/fb/mxsfb.txt
diff --git a/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
diff --git a/trunk/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt b/trunk/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -913,7 +913,7 @@ config ARCH_NOMADIK
 	select ARM_AMBA
 	select ARM_VIC
 	select CPU_ARM926T
-	select COMMON_CLK
+	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select MIGHT_HAVE_CACHE_L2X0
@@ -1021,6 +1021,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-lpc32xx/Kconfig"
+
 source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"

diff --git a/trunk/arch/arm/boot/dts/cfa10036.dts b/trunk/arch/arm/boot/dts/cfa10036.dts
diff --git a/trunk/arch/arm/boot/dts/ea3250.dts b/trunk/arch/arm/boot/dts/ea3250.dts