From 8cb439576d36fbf167271764a78ff2da3ca17308 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Mon, 2 Apr 2012 20:44:20 +0200
Subject: [PATCH] --- yaml --- r: 298693 b: refs/heads/master c:
 dcce6ce802c271cd7c21f4730f301150577b2826 h: refs/heads/master i:   298691:
 805042eba6b9148a29bc61ea87b8253824ca6756 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/boot/dts/at91sam9g20.dtsi     | 2 +-
 trunk/arch/arm/boot/dts/at91sam9g45.dtsi     | 2 +-
 trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +-
 trunk/arch/arm/boot/dts/at91sam9x5.dtsi      | 2 +-
 trunk/arch/arm/boot/dts/at91sam9x5cm.dtsi    | 2 +-
 trunk/arch/arm/boot/dts/usb_a9g20.dts        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f492251d9ba5..89bb520a3f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c2c1f624d4f99825851f0253f1308dd591df6ef
+refs/heads/master: dcce6ce802c271cd7c21f4730f301150577b2826
diff --git a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi b/trunk/arch/arm/boot/dts/at91sam9g20.dtsi
index 92f36627e7f8..799ad1889b51 100644
--- a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/trunk/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -35,7 +35,7 @@
 		};
 	};
 
-	memory@20000000 {
+	memory {
 		reg = <0x20000000 0x08000000>;
 	};
 
diff --git a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi
index 3d0c32fb218f..9e6eb6ecea0e 100644
--- a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -36,7 +36,7 @@
 		};
 	};
 
-	memory@70000000 {
+	memory {
 		reg = <0x70000000 0x10000000>;
 	};
 
diff --git a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 6abb5710a01e..a3633bd13111 100644
--- a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -17,7 +17,7 @@
 		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
 	};
 
-	memory@70000000 {
+	memory {
 		reg = <0x70000000 0x4000000>;
 	};
 
diff --git a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi
index 659717768633..70ab3a4e026f 100644
--- a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -34,7 +34,7 @@
 		};
 	};
 
-	memory@20000000 {
+	memory {
 		reg = <0x20000000 0x10000000>;
 	};
 
diff --git a/trunk/arch/arm/boot/dts/at91sam9x5cm.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 67936f83c694..31e7be23703d 100644
--- a/trunk/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/trunk/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -8,7 +8,7 @@
  */
 
 / {
-	memory@20000000 {
+	memory {
 		reg = <0x20000000 0x8000000>;
 	};
 
diff --git a/trunk/arch/arm/boot/dts/usb_a9g20.dts b/trunk/arch/arm/boot/dts/usb_a9g20.dts
index 3b3c4e0fa79f..7c2399c532e5 100644
--- a/trunk/arch/arm/boot/dts/usb_a9g20.dts
+++ b/trunk/arch/arm/boot/dts/usb_a9g20.dts
@@ -16,7 +16,7 @@
 		bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
 	};
 
-	memory@20000000 {
+	memory {
 		reg = <0x20000000 0x4000000>;
 	};