diff for duplicates of <1462910970-1812-18-git-send-email-krzk@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index 206ae6d..c04972d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -58,7 +58,7 @@ index 58d3844ef923..c0540eb76271 100644
#size-cells = <1>;
ranges;
-- combiner: interrupt-controller@10440000 {
+- combiner: interrupt-controller at 10440000 {
- compatible = "samsung,exynos4210-combiner";
- #interrupt-cells = <2>;
- interrupt-controller;
@@ -74,7 +74,7 @@ index 58d3844ef923..c0540eb76271 100644
- <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
- };
-
-- gic: interrupt-controller@10481000 {
+- gic: interrupt-controller at 10481000 {
- compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
- #interrupt-cells = <3>;
- interrupt-controller;
@@ -85,12 +85,12 @@ index 58d3844ef923..c0540eb76271 100644
- interrupts = <1 9 0xf04>;
- };
-
-- chipid@10000000 {
+- chipid at 10000000 {
- compatible = "samsung,exynos4210-chipid";
- reg = <0x10000000 0x100>;
- };
-
-- sromc: memory-controller@12250000 {
+- sromc: memory-controller at 12250000 {
- compatible = "samsung,exynos4210-srom";
- reg = <0x12250000 0x14>;
- #address-cells = <2>;
@@ -101,7 +101,7 @@ index 58d3844ef923..c0540eb76271 100644
- 3 0 0x07000000 0x20000>;
- };
-
- pmu_system_controller: system-controller@10040000 {
+ pmu_system_controller: system-controller at 10040000 {
compatible = "samsung,exynos5410-pmu", "syscon";
reg = <0x10040000 0x5000>;
@@ -236,34 +191,40 @@
@@ -111,7 +111,7 @@ index 58d3844ef923..c0540eb76271 100644
+ };
+};
-- uart0: serial@12C00000 {
+- uart0: serial at 12C00000 {
- compatible = "samsung,exynos4210-uart";
- reg = <0x12C00000 0x100>;
- interrupts = <0 51 0>;
@@ -124,7 +124,7 @@ index 58d3844ef923..c0540eb76271 100644
+ clock-names = "timers";
+};
-- uart1: serial@12C10000 {
+- uart1: serial at 12C10000 {
- compatible = "samsung,exynos4210-uart";
- reg = <0x12C10000 0x100>;
- interrupts = <0 52 0>;
@@ -137,7 +137,7 @@ index 58d3844ef923..c0540eb76271 100644
+ clock-names = "uart", "clk_uart_baud0";
+};
-- uart2: serial@12C20000 {
+- uart2: serial at 12C20000 {
- compatible = "samsung,exynos4210-uart";
- reg = <0x12C20000 0x100>;
- interrupts = <0 53 0>;
diff --git a/a/content_digest b/N1/content_digest
index b23a0ef..524cd79 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001462910970-1812-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 v3 17/27] ARM: dts: exynos: Include common exynos5 in exynos5410.dtsi\0"
@@ -11,22 +11,7 @@
"Date\0Tue, 10 May 2016 22:09:20 +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"
@@ -95,7 +80,7 @@
" \t\t#size-cells = <1>;\n",
" \t\tranges;\n",
" \n",
- "-\t\tcombiner: interrupt-controller\@10440000 {\n",
+ "-\t\tcombiner: interrupt-controller at 10440000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-combiner\";\n",
"-\t\t\t#interrupt-cells = <2>;\n",
"-\t\t\tinterrupt-controller;\n",
@@ -111,7 +96,7 @@
"-\t\t\t\t\t<0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tgic: interrupt-controller\@10481000 {\n",
+ "-\t\tgic: interrupt-controller at 10481000 {\n",
"-\t\t\tcompatible = \"arm,cortex-a15-gic\", \"arm,cortex-a9-gic\";\n",
"-\t\t\t#interrupt-cells = <3>;\n",
"-\t\t\tinterrupt-controller;\n",
@@ -122,12 +107,12 @@
"-\t\t\tinterrupts = <1 9 0xf04>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tchipid\@10000000 {\n",
+ "-\t\tchipid at 10000000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-chipid\";\n",
"-\t\t\treg = <0x10000000 0x100>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tsromc: memory-controller\@12250000 {\n",
+ "-\t\tsromc: memory-controller at 12250000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-srom\";\n",
"-\t\t\treg = <0x12250000 0x14>;\n",
"-\t\t\t#address-cells = <2>;\n",
@@ -138,7 +123,7 @@
"-\t\t\t\t 3 0 0x07000000 0x20000>;\n",
"-\t\t};\n",
"-\n",
- " \t\tpmu_system_controller: system-controller\@10040000 {\n",
+ " \t\tpmu_system_controller: system-controller at 10040000 {\n",
" \t\t\tcompatible = \"samsung,exynos5410-pmu\", \"syscon\";\n",
" \t\t\treg = <0x10040000 0x5000>;\n",
"\@\@ -236,34 +191,40 \@\@\n",
@@ -148,7 +133,7 @@
"+\t};\n",
"+};\n",
" \n",
- "-\t\tuart0: serial\@12C00000 {\n",
+ "-\t\tuart0: serial at 12C00000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
"-\t\t\treg = <0x12C00000 0x100>;\n",
"-\t\t\tinterrupts = <0 51 0>;\n",
@@ -161,7 +146,7 @@
"+\tclock-names = \"timers\";\n",
"+};\n",
" \n",
- "-\t\tuart1: serial\@12C10000 {\n",
+ "-\t\tuart1: serial at 12C10000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
"-\t\t\treg = <0x12C10000 0x100>;\n",
"-\t\t\tinterrupts = <0 52 0>;\n",
@@ -174,7 +159,7 @@
"+\tclock-names = \"uart\", \"clk_uart_baud0\";\n",
"+};\n",
" \n",
- "-\t\tuart2: serial\@12C20000 {\n",
+ "-\t\tuart2: serial at 12C20000 {\n",
"-\t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
"-\t\t\treg = <0x12C20000 0x100>;\n",
"-\t\t\tinterrupts = <0 53 0>;\n",
@@ -211,4 +196,4 @@
"2.5.0"
]
-29740dde07d3268bb18a2e814de1296585c1715faf4555b5405b5fdc060e7272
+2baac480f646309e5e2bbd3d3b465f045015a48b299c2b5bb45299c275719f5b
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.