All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <1375821851-31609-17-git-send-email-gsi@denx.de>

diff --git a/a/1.txt b/N1/1.txt
index 4d5fd1e..898582c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -29,10 +29,10 @@ index a543c40..a1b8837 100644
 +		};
 +	};
 +
- 	soc@80000000 {
+ 	soc at 80000000 {
 +		bus-frequency = <80000000>;	/* 80 MHz ips bus */
  
- 		clock@f00 {
+ 		clock at f00 {
  			compatible = "fsl,mpc5121rev2-clock", "fsl,mpc5121-clock";
 diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi
 index bd14c00..8f4cba0 100644
@@ -61,15 +61,15 @@ index bd14c00..8f4cba0 100644
 +		};
 +	};
 +
- 	soc@80000000 {
+ 	soc at 80000000 {
  		compatible = "fsl,mpc5121-immr";
  		#address-cells = <1>;
 @@ -118,9 +130,10 @@
  		};
  
  		/* Clock control */
--		clock@f00 {
-+		clks: clock@f00 {
+-		clock at f00 {
++		clks: clock at f00 {
  			compatible = "fsl,mpc5121-clock";
  			reg = <0xf00 0x100>;
 +			#clock-cells = <1>;
diff --git a/a/content_digest b/N1/content_digest
index 795c730..3a657cd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
   "ref\0001375821851-31609-1-git-send-email-gsi\@denx.de\0"
 ]
 [
-  "From\0Gerhard Sittig <gsi\@denx.de>\0"
+  "From\0gsi\@denx.de (Gerhard Sittig)\0"
 ]
 [
   "Subject\0[PATCH v4 16/31] dts: mpc512x: add clock related device tree specs\0"
@@ -14,23 +14,7 @@
   "Date\0Tue,  6 Aug 2013 22:43:56 +0200\0"
 ]
 [
-  "To\0linuxppc-dev\@lists.ozlabs.org",
-  " Anatolij Gustschin <agust\@denx.de>",
-  " Mike Turquette <mturquette\@linaro.org>",
-  " linux-arm-kernel\@lists.infradead.org",
-  " devicetree\@vger.kernel.org\0"
-]
-[
-  "Cc\0Detlev Zundel <dzu\@denx.de>",
-  " Wolfram Sang <wsa\@the-dreams.de>",
-  " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
-  " Gerhard Sittig <gsi\@denx.de>",
-  " Rob Herring <rob.herring\@calxeda.com>",
-  " Mark Brown <broonie\@kernel.org>",
-  " Marc Kleine-Budde <mkl\@pengutronix.de>",
-  " David Woodhouse <dwmw2\@infradead.org>",
-  " Wolfgang Grandegger <wg\@grandegger.com>",
-  " Mauro Carvalho Chehab <m.chehab\@samsung.com>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -70,10 +54,10 @@
   "+\t\t};\n",
   "+\t};\n",
   "+\n",
-  " \tsoc\@80000000 {\n",
+  " \tsoc at 80000000 {\n",
   "+\t\tbus-frequency = <80000000>;\t/* 80 MHz ips bus */\n",
   " \n",
-  " \t\tclock\@f00 {\n",
+  " \t\tclock at f00 {\n",
   " \t\t\tcompatible = \"fsl,mpc5121rev2-clock\", \"fsl,mpc5121-clock\";\n",
   "diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi\n",
   "index bd14c00..8f4cba0 100644\n",
@@ -102,15 +86,15 @@
   "+\t\t};\n",
   "+\t};\n",
   "+\n",
-  " \tsoc\@80000000 {\n",
+  " \tsoc at 80000000 {\n",
   " \t\tcompatible = \"fsl,mpc5121-immr\";\n",
   " \t\t#address-cells = <1>;\n",
   "\@\@ -118,9 +130,10 \@\@\n",
   " \t\t};\n",
   " \n",
   " \t\t/* Clock control */\n",
-  "-\t\tclock\@f00 {\n",
-  "+\t\tclks: clock\@f00 {\n",
+  "-\t\tclock at f00 {\n",
+  "+\t\tclks: clock at f00 {\n",
   " \t\t\tcompatible = \"fsl,mpc5121-clock\";\n",
   " \t\t\treg = <0xf00 0x100>;\n",
   "+\t\t\t#clock-cells = <1>;\n",
@@ -121,4 +105,4 @@
   "1.7.10.4"
 ]
 
-a6249cf0d134aa61fdce4317b0f2a815b6a11089b8a8455dd6b516d1adcbdf97
+29dce3307095bce03e460f983abfc2e0fb6c47b6812ad7e8376172d54bea4931
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.