diff for duplicates of <264124e14b966a1bbc07c364fbd89fc55aa765e6.1527244201.git.viresh.kumar@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index 1e39870..a8478fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -138,8 +138,8 @@ index 70483ce72ba6..78b89bb1bfed 100644
soc-supply = <®_soc>;
};
-- cpu@1 {
-+ cpu1: cpu@1 {
+- cpu at 1 {
++ cpu1: cpu at 1 {
compatible = "arm,cortex-a9";
device_type = "cpu";
reg = <1>;
@@ -173,8 +173,8 @@ index 70483ce72ba6..78b89bb1bfed 100644
+ soc-supply = <®_soc>;
};
-- cpu@2 {
-+ cpu2: cpu@2 {
+- cpu at 2 {
++ cpu2: cpu at 2 {
compatible = "arm,cortex-a9";
device_type = "cpu";
reg = <2>;
@@ -208,8 +208,8 @@ index 70483ce72ba6..78b89bb1bfed 100644
+ soc-supply = <®_soc>;
};
-- cpu@3 {
-+ cpu3: cpu@3 {
+- cpu at 3 {
++ cpu3: cpu at 3 {
compatible = "arm,cortex-a9";
device_type = "cpu";
reg = <3>;
diff --git a/a/content_digest b/N1/content_digest
index 3319292..460f24a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1527244200.git.viresh.kumar\@linaro.org\0"
]
[
- "From\0Viresh Kumar <viresh.kumar\@linaro.org>\0"
+ "From\0viresh.kumar\@linaro.org (Viresh Kumar)\0"
]
[
"Subject\0[PATCH 15/15] arm: dts: imx: Add missing OPP properties for CPUs\0"
@@ -11,23 +11,7 @@
"Date\0Fri, 25 May 2018 16:02:01 +0530\0"
]
[
- "To\0arm\@kernel.org",
- " Shawn Guo <shawnguo\@kernel.org>",
- " Sascha Hauer <s.hauer\@pengutronix.de>",
- " Pengutronix Kernel Team <kernel\@pengutronix.de>",
- " Fabio Estevam <fabio.estevam\@nxp.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>\0"
-]
-[
- "Cc\0Viresh Kumar <viresh.kumar\@linaro.org>",
- " Vincent Guittot <vincent.guittot\@linaro.org>",
- " ionela.voinescu\@arm.com",
- " Daniel Lezcano <daniel.lezcano\@linaro.org>",
- " chris.redpath\@arm.com",
- " linux-arm-kernel\@lists.infradead.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -176,8 +160,8 @@
" \t\t\tsoc-supply = <®_soc>;\n",
" \t\t};\n",
" \n",
- "-\t\tcpu\@1 {\n",
- "+\t\tcpu1: cpu\@1 {\n",
+ "-\t\tcpu at 1 {\n",
+ "+\t\tcpu1: cpu at 1 {\n",
" \t\t\tcompatible = \"arm,cortex-a9\";\n",
" \t\t\tdevice_type = \"cpu\";\n",
" \t\t\treg = <1>;\n",
@@ -211,8 +195,8 @@
"+\t\t\tsoc-supply = <®_soc>;\n",
" \t\t};\n",
" \n",
- "-\t\tcpu\@2 {\n",
- "+\t\tcpu2: cpu\@2 {\n",
+ "-\t\tcpu at 2 {\n",
+ "+\t\tcpu2: cpu at 2 {\n",
" \t\t\tcompatible = \"arm,cortex-a9\";\n",
" \t\t\tdevice_type = \"cpu\";\n",
" \t\t\treg = <2>;\n",
@@ -246,8 +230,8 @@
"+\t\t\tsoc-supply = <®_soc>;\n",
" \t\t};\n",
" \n",
- "-\t\tcpu\@3 {\n",
- "+\t\tcpu3: cpu\@3 {\n",
+ "-\t\tcpu at 3 {\n",
+ "+\t\tcpu3: cpu at 3 {\n",
" \t\t\tcompatible = \"arm,cortex-a9\";\n",
" \t\t\tdevice_type = \"cpu\";\n",
" \t\t\treg = <3>;\n",
@@ -302,4 +286,4 @@
"2.15.0.194.g9af6a3dea062"
]
-f5dd75a573681514712082f4bebdba7629d842d5dc1881271372e2bf7aa493d8
+f2e30fd74f2612729618327e399ba1a5e4b6bfdd7be42c3f8a676e31c7d6fa0e
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.