All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20120510070941.17209.38029.sendpatchset@w520>

diff --git a/a/1.txt b/N1/1.txt
index 8510c91..4abce5b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -55,15 +55,15 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se>
 +	interrupt-parent = <&gic>;
 +
 +	cpus {
-+		cpu@0 {
++		cpu at 0 {
 +			compatible = "arm,cortex-a9";
 +		};
-+		cpu@1 {
++		cpu at 1 {
 +			compatible = "arm,cortex-a9";
 +		};
 +	};
 +
-+	gic: interrupt-controller@e0020000 {
++	gic: interrupt-controller at e0020000 {
 +		compatible = "arm,cortex-a9-gic";
 +		interrupt-controller;
 +		#interrupt-cells = <3>;
@@ -72,7 +72,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se>
 +	};
 +
 +	chosen {
-+		bootargs = "console=ttyS1,115200n81 mem\x128M@0x40000000 ignore_loglevel";
++		bootargs = "console=ttyS1,115200n81 mem=128M at 0x40000000 ignore_loglevel";
 +	};
 +
 +	memory {
@@ -80,31 +80,31 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se>
 +		reg = <0x40000000 0x8000000>; /* 128 MB */
 +	};
 +
-+	sti@e0180000 {
++	sti at e0180000 {
 +		compatible = "renesas,em-sti";
 +		reg = <0xe0180000 0x54>;
 +		interrupts = <0 125 0>;
 +       };
 +
-+	uart@e1020000 {
++	uart at e1020000 {
 +		compatible = "renesas,em-uart";
 +		reg = <0xe1020000 0x38>;
 +		interrupts = <0 8 0>;
 +       };
 +
-+	uart@e1030000 {
++	uart at e1030000 {
 +		compatible = "renesas,em-uart";
 +		reg = <0xe1030000 0x38>;
 +		interrupts = <0 9 0>;
 +       };
 +
-+	uart@e1040000 {
++	uart at e1040000 {
 +		compatible = "renesas,em-uart";
 +		reg = <0xe1040000 0x38>;
 +		interrupts = <0 10 0>;
 +       };
 +
-+	uart@e1050000 {
++	uart at e1050000 {
 +		compatible = "renesas,em-uart";
 +		reg = <0xe1050000 0x38>;
 +		interrupts = <0 11 0>;
diff --git a/a/content_digest b/N1/content_digest
index ec951b3..0d05522 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
- "From\0Magnus Damm <magnus.damm@gmail.com>\0"
+ "From\0magnus.damm@gmail.com (Magnus Damm)\0"
  "Subject\0[PATCH] mach-shmobile: Emma Mobile EV2 DT prototype code\0"
- "Date\0Thu, 10 May 2012 07:09:41 +0000\0"
+ "Date\0Thu, 10 May 2012 16:09:41 +0900\0"
  "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
@@ -61,15 +61,15 @@
  "+\tinterrupt-parent = <&gic>;\n"
  "+\n"
  "+\tcpus {\n"
- "+\t\tcpu@0 {\n"
+ "+\t\tcpu at 0 {\n"
  "+\t\t\tcompatible = \"arm,cortex-a9\";\n"
  "+\t\t};\n"
- "+\t\tcpu@1 {\n"
+ "+\t\tcpu at 1 {\n"
  "+\t\t\tcompatible = \"arm,cortex-a9\";\n"
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tgic: interrupt-controller@e0020000 {\n"
+ "+\tgic: interrupt-controller at e0020000 {\n"
  "+\t\tcompatible = \"arm,cortex-a9-gic\";\n"
  "+\t\tinterrupt-controller;\n"
  "+\t\t#interrupt-cells = <3>;\n"
@@ -78,7 +78,7 @@
  "+\t};\n"
  "+\n"
  "+\tchosen {\n"
- "+\t\tbootargs = \"console=ttyS1,115200n81 mem\0228M@0x40000000 ignore_loglevel\";\n"
+ "+\t\tbootargs = \"console=ttyS1,115200n81 mem=128M at 0x40000000 ignore_loglevel\";\n"
  "+\t};\n"
  "+\n"
  "+\tmemory {\n"
@@ -86,31 +86,31 @@
  "+\t\treg = <0x40000000 0x8000000>; /* 128 MB */\n"
  "+\t};\n"
  "+\n"
- "+\tsti@e0180000 {\n"
+ "+\tsti at e0180000 {\n"
  "+\t\tcompatible = \"renesas,em-sti\";\n"
  "+\t\treg = <0xe0180000 0x54>;\n"
  "+\t\tinterrupts = <0 125 0>;\n"
  "+       };\n"
  "+\n"
- "+\tuart@e1020000 {\n"
+ "+\tuart at e1020000 {\n"
  "+\t\tcompatible = \"renesas,em-uart\";\n"
  "+\t\treg = <0xe1020000 0x38>;\n"
  "+\t\tinterrupts = <0 8 0>;\n"
  "+       };\n"
  "+\n"
- "+\tuart@e1030000 {\n"
+ "+\tuart at e1030000 {\n"
  "+\t\tcompatible = \"renesas,em-uart\";\n"
  "+\t\treg = <0xe1030000 0x38>;\n"
  "+\t\tinterrupts = <0 9 0>;\n"
  "+       };\n"
  "+\n"
- "+\tuart@e1040000 {\n"
+ "+\tuart at e1040000 {\n"
  "+\t\tcompatible = \"renesas,em-uart\";\n"
  "+\t\treg = <0xe1040000 0x38>;\n"
  "+\t\tinterrupts = <0 10 0>;\n"
  "+       };\n"
  "+\n"
- "+\tuart@e1050000 {\n"
+ "+\tuart at e1050000 {\n"
  "+\t\tcompatible = \"renesas,em-uart\";\n"
  "+\t\treg = <0xe1050000 0x38>;\n"
  "+\t\tinterrupts = <0 11 0>;\n"
@@ -225,4 +225,4 @@
  "+\n"
  +#endif /* CONFIG_USE_OF */
 
-833aaa775770da3dcb0a8d4caba66b3318121bbad27e70fcc14d5169239cc3ff
+37ed175921c899e4bf1e0b5088512ed0726bbcf51530a1dd5e06bacf1d996e9f

diff --git a/a/1.txt b/N2/1.txt
index 8510c91..4ebe5f2 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -72,7 +72,7 @@ Not-yet-signed-off-by: Magnus Damm <damm@opensource.se>
 +	};
 +
 +	chosen {
-+		bootargs = "console=ttyS1,115200n81 mem\x128M@0x40000000 ignore_loglevel";
++		bootargs = "console=ttyS1,115200n81 mem=128M@0x40000000 ignore_loglevel";
 +	};
 +
 +	memory {
diff --git a/a/content_digest b/N2/content_digest
index ec951b3..37bfb52 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,7 +1,16 @@
  "From\0Magnus Damm <magnus.damm@gmail.com>\0"
  "Subject\0[PATCH] mach-shmobile: Emma Mobile EV2 DT prototype code\0"
- "Date\0Thu, 10 May 2012 07:09:41 +0000\0"
+ "Date\0Thu, 10 May 2012 16:09:41 +0900\0"
  "To\0linux-arm-kernel@lists.infradead.org\0"
+ "Cc\0horms@verge.net.au"
+  linux@arm.linux.org.uk
+  arnd@arndb.de
+  linux-sh@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  rjw@sisk.pl
+  lethal@linux-sh.org
+  olof@lixom.net
+ " Magnus Damm <magnus.damm@gmail.com>\0"
  "\00:1\0"
  "b\0"
  "From: Magnus Damm <damm@opensource.se>\n"
@@ -78,7 +87,7 @@
  "+\t};\n"
  "+\n"
  "+\tchosen {\n"
- "+\t\tbootargs = \"console=ttyS1,115200n81 mem\0228M@0x40000000 ignore_loglevel\";\n"
+ "+\t\tbootargs = \"console=ttyS1,115200n81 mem=128M@0x40000000 ignore_loglevel\";\n"
  "+\t};\n"
  "+\n"
  "+\tmemory {\n"
@@ -225,4 +234,4 @@
  "+\n"
  +#endif /* CONFIG_USE_OF */
 
-833aaa775770da3dcb0a8d4caba66b3318121bbad27e70fcc14d5169239cc3ff
+d9c2e01f167df483614bfd3f916d48cca34292324a890aacca1e964bbcdc1d5a

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.