diff for duplicates of <1464429273-23457-21-git-send-email-krzk@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index ded273d..dcb208f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -36,7 +36,7 @@ index 8fa65eb8027d..8b1e706e9250 100644
};
- /* i2c_0-3 are defined in exynos5.dtsi */
-- hsi2c_4: i2c@12CA0000 {
+- hsi2c_4: i2c at 12CA0000 {
- compatible = "samsung,exynos5250-hsi2c";
- reg = <0x12CA0000 0x1000>;
- interrupts = <0 60 0>;
@@ -49,7 +49,7 @@ index 8fa65eb8027d..8b1e706e9250 100644
- status = "disabled";
- };
-
-- hsi2c_5: i2c@12CB0000 {
+- hsi2c_5: i2c at 12CB0000 {
- compatible = "samsung,exynos5250-hsi2c";
- reg = <0x12CB0000 0x1000>;
- interrupts = <0 61 0>;
@@ -62,7 +62,7 @@ index 8fa65eb8027d..8b1e706e9250 100644
- status = "disabled";
- };
-
-- hsi2c_6: i2c@12CC0000 {
+- hsi2c_6: i2c at 12CC0000 {
- compatible = "samsung,exynos5250-hsi2c";
- reg = <0x12CC0000 0x1000>;
- interrupts = <0 62 0>;
@@ -75,7 +75,7 @@ index 8fa65eb8027d..8b1e706e9250 100644
- status = "disabled";
- };
-
-- hsi2c_7: i2c@12CD0000 {
+- hsi2c_7: i2c at 12CD0000 {
- compatible = "samsung,exynos5250-hsi2c";
- reg = <0x12CD0000 0x1000>;
- interrupts = <0 63 0>;
@@ -88,7 +88,7 @@ index 8fa65eb8027d..8b1e706e9250 100644
- status = "disabled";
- };
-
- hsi2c_8: i2c@12E00000 {
+ hsi2c_8: i2c at 12E00000 {
compatible = "samsung,exynos5250-hsi2c";
reg = <0x12E00000 0x1000>;
@@ -1022,6 +965,34 @@
@@ -146,7 +146,7 @@ index e01d068d4c38..44a8391c8524 100644
};
+ /* i2c_0-3 are defined in exynos5.dtsi */
-+ hsi2c_4: i2c@12ca0000 {
++ hsi2c_4: i2c at 12ca0000 {
+ compatible = "samsung,exynos5250-hsi2c";
+ reg = <0x12ca0000 0x1000>;
+ interrupts = <0 60 0>;
@@ -155,7 +155,7 @@ index e01d068d4c38..44a8391c8524 100644
+ status = "disabled";
+ };
+
-+ hsi2c_5: i2c@12cb0000 {
++ hsi2c_5: i2c at 12cb0000 {
+ compatible = "samsung,exynos5250-hsi2c";
+ reg = <0x12cb0000 0x1000>;
+ interrupts = <0 61 0>;
@@ -164,7 +164,7 @@ index e01d068d4c38..44a8391c8524 100644
+ status = "disabled";
+ };
+
-+ hsi2c_6: i2c@12cc0000 {
++ hsi2c_6: i2c at 12cc0000 {
+ compatible = "samsung,exynos5250-hsi2c";
+ reg = <0x12cc0000 0x1000>;
+ interrupts = <0 62 0>;
@@ -173,7 +173,7 @@ index e01d068d4c38..44a8391c8524 100644
+ status = "disabled";
+ };
+
-+ hsi2c_7: i2c@12cd0000 {
++ hsi2c_7: i2c at 12cd0000 {
+ compatible = "samsung,exynos5250-hsi2c";
+ reg = <0x12cd0000 0x1000>;
+ interrupts = <0 63 0>;
diff --git a/a/content_digest b/N1/content_digest
index b462fa8..3e8f2e5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001464429273-23457-1-git-send-email-krzk\@kernel.org\0"
]
[
- "From\0Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "From\0krzk\@kernel.org (Krzysztof Kozlowski)\0"
]
[
"Subject\0[PATCH v5 20/22] ARM: dts: exynos: Move HSI2C nodes to exynos54xx.dtsi\0"
@@ -11,22 +11,7 @@
"Date\0Sat, 28 May 2016 11:54:31 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
- " Sylwester Nawrocki <s.nawrocki\@samsung.com>",
- " Tomasz Figa <tomasz.figa\@gmail.com>",
- " Michael Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-clk\@vger.kernel.org\0"
-]
-[
- "Cc\0Javier Martinez Canillas <javier\@osg.samsung.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -73,7 +58,7 @@
" \t\t};\n",
" \n",
"-\t\t/* i2c_0-3 are defined in exynos5.dtsi */\n",
- "-\t\thsi2c_4: i2c\@12CA0000 {\n",
+ "-\t\thsi2c_4: i2c at 12CA0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"-\t\t\treg = <0x12CA0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 60 0>;\n",
@@ -86,7 +71,7 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- "-\t\thsi2c_5: i2c\@12CB0000 {\n",
+ "-\t\thsi2c_5: i2c at 12CB0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"-\t\t\treg = <0x12CB0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 61 0>;\n",
@@ -99,7 +84,7 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- "-\t\thsi2c_6: i2c\@12CC0000 {\n",
+ "-\t\thsi2c_6: i2c at 12CC0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"-\t\t\treg = <0x12CC0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 62 0>;\n",
@@ -112,7 +97,7 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- "-\t\thsi2c_7: i2c\@12CD0000 {\n",
+ "-\t\thsi2c_7: i2c at 12CD0000 {\n",
"-\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"-\t\t\treg = <0x12CD0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 63 0>;\n",
@@ -125,7 +110,7 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- " \t\thsi2c_8: i2c\@12E00000 {\n",
+ " \t\thsi2c_8: i2c at 12E00000 {\n",
" \t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
" \t\t\treg = <0x12E00000 0x1000>;\n",
"\@\@ -1022,6 +965,34 \@\@\n",
@@ -183,7 +168,7 @@
" \t\t};\n",
" \n",
"+\t\t/* i2c_0-3 are defined in exynos5.dtsi */\n",
- "+\t\thsi2c_4: i2c\@12ca0000 {\n",
+ "+\t\thsi2c_4: i2c at 12ca0000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"+\t\t\treg = <0x12ca0000 0x1000>;\n",
"+\t\t\tinterrupts = <0 60 0>;\n",
@@ -192,7 +177,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\thsi2c_5: i2c\@12cb0000 {\n",
+ "+\t\thsi2c_5: i2c at 12cb0000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"+\t\t\treg = <0x12cb0000 0x1000>;\n",
"+\t\t\tinterrupts = <0 61 0>;\n",
@@ -201,7 +186,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\thsi2c_6: i2c\@12cc0000 {\n",
+ "+\t\thsi2c_6: i2c at 12cc0000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"+\t\t\treg = <0x12cc0000 0x1000>;\n",
"+\t\t\tinterrupts = <0 62 0>;\n",
@@ -210,7 +195,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\thsi2c_7: i2c\@12cd0000 {\n",
+ "+\t\thsi2c_7: i2c at 12cd0000 {\n",
"+\t\t\tcompatible = \"samsung,exynos5250-hsi2c\";\n",
"+\t\t\treg = <0x12cd0000 0x1000>;\n",
"+\t\t\tinterrupts = <0 63 0>;\n",
@@ -226,4 +211,4 @@
"2.7.4"
]
-8eac64560a5200bed7fd3bf54e4edb09642465002f5497c0e379f21b4f545aa7
+bebb549d49ce79560cd0edf4a5429604bdfe52da6e6debcd7c548ac2dcd6c4f2
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.