From 72f1acae4abcbf31310d8710598fb69b29db649f Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 11 May 2012 16:26:03 -0600
Subject: [PATCH] --- yaml --- r: 308375 b: refs/heads/master c:
 5ff488875b982f5a1acc02ba74b23d2802d2613a h: refs/heads/master i:   308373:
 c597901ba7ed8df59e5fbb3a93039359c13a1853   308371:
 ffb9de662168ff67602c46242c5a79ebcc724862   308367:
 f9ecfa7b9753aafe03654741e3902226ca7f188c v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/boot/dts/tegra20.dtsi | 4 ++--
 trunk/arch/arm/boot/dts/tegra30.dtsi | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3700303ffe48..d78d4378de36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c44e438a7ff53b14d0fc433258b93948e1884f22
+refs/heads/master: 5ff488875b982f5a1acc02ba74b23d2802d2613a
diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi
index a6b135164ae0..7f718bd03452 100644
--- a/trunk/arch/arm/boot/dts/tegra20.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra20.dtsi
@@ -13,8 +13,8 @@
 		compatible = "arm,cortex-a9-gic";
 		interrupt-controller;
 		#interrupt-cells = <3>;
-		reg = <0x50041000 0x1000>,
-		      <0x50040100 0x0100>;
+		reg = <0x50041000 0x1000
+		       0x50040100 0x0100>;
 	};
 
 	pmu {
diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi
index 45547ad82972..b52378a06fb3 100644
--- a/trunk/arch/arm/boot/dts/tegra30.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra30.dtsi
@@ -13,8 +13,8 @@
 		compatible = "arm,cortex-a9-gic";
 		interrupt-controller;
 		#interrupt-cells = <3>;
-		reg = <0x50041000 0x1000>,
-		      <0x50040100 0x0100>;
+		reg = <0x50041000 0x1000
+		       0x50040100 0x0100>;
 	};
 
 	pmu {
@@ -186,7 +186,8 @@
 
 	ahub {
 		compatible = "nvidia,tegra30-ahub";
-		reg = <0x70080000 0x200 0x70080200 0x100>;
+		reg = <0x70080000 0x200
+		       0x70080200 0x100>;
 		interrupts = <0 103 0x04>;
 		nvidia,dma-request-selector = <&apbdma 1>;