diff for duplicates of <1474054971-16831-4-git-send-email-krzk@kernel.org>
diff --git a/a/content_digest b/N1/content_digest
index c34a44d..8dbb491 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -20,11 +20,11 @@
" linux-kernel\@vger.kernel.org\0"
]
[
- "Cc\0Marek Szyprowski <m.szyprowski\@samsung.com>",
+ "Cc\0Marc Zyngier <marc.zyngier\@arm.com>",
" Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
" Alban Browaeys <alban.browaeys\@gmail.com>",
- " Marc Zyngier <marc.zyngier\@arm.com>\0"
+ " Marek Szyprowski <m.szyprowski\@samsung.com>\0"
]
[
"\0000:1\0"
@@ -220,4 +220,4 @@
"2.7.4"
]
-e9b4f8de6e18fcc58c5599aa2992be6ab8ed7ad7fcdf6def445eeb1623bbce8f
+ec7b583e33e2c4d7addf27defacc7ee1569c2a119f576a383561b29a896af5fe
diff --git a/a/1.txt b/N2/1.txt
index fe3d2f6..71bf1c1 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -73,7 +73,7 @@ index 3394bdcf10ae..2f52b685daf9 100644
};
@@ -112,7 +112,7 @@
- g2d: g2d@10800000 {
+ g2d: g2d at 10800000 {
compatible = "samsung,exynos4212-g2d";
reg = <0x10800000 0x1000>;
- interrupts = <0 89 0>;
@@ -82,7 +82,7 @@ index 3394bdcf10ae..2f52b685daf9 100644
clock-names = "sclk_fimg2d", "fimg2d";
iommus = <&sysmmu_g2d>;
@@ -127,7 +127,7 @@
- fimc_lite_0: fimc-lite@12390000 {
+ fimc_lite_0: fimc-lite at 12390000 {
compatible = "samsung,exynos4212-fimc-lite";
reg = <0x12390000 0x1000>;
- interrupts = <0 105 0>;
@@ -91,7 +91,7 @@ index 3394bdcf10ae..2f52b685daf9 100644
clocks = <&clock CLK_FIMC_LITE0>;
clock-names = "flite";
@@ -138,7 +138,7 @@
- fimc_lite_1: fimc-lite@123A0000 {
+ fimc_lite_1: fimc-lite at 123A0000 {
compatible = "samsung,exynos4212-fimc-lite";
reg = <0x123A0000 0x1000>;
- interrupts = <0 106 0>;
@@ -100,7 +100,7 @@ index 3394bdcf10ae..2f52b685daf9 100644
clocks = <&clock CLK_FIMC_LITE1>;
clock-names = "flite";
@@ -149,7 +149,8 @@
- fimc_is: fimc-is@12000000 {
+ fimc_is: fimc-is at 12000000 {
compatible = "samsung,exynos4212-fimc-is", "simple-bus";
reg = <0x12000000 0x260000>;
- interrupts = <0 90 0>, <0 95 0>;
@@ -110,7 +110,7 @@ index 3394bdcf10ae..2f52b685daf9 100644
clocks = <&clock CLK_FIMC_LITE0>,
<&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
@@ -200,7 +201,7 @@
- mshc_0: mmc@12550000 {
+ mshc_0: mmc at 12550000 {
compatible = "samsung,exynos4412-dw-mshc";
reg = <0x12550000 0x1000>;
- interrupts = <0 77 0>;
diff --git a/a/content_digest b/N2/content_digest
index c34a44d..5c36c1d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001474054971-16831-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 03/10] ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12\0"
@@ -11,20 +11,7 @@
"Date\0Fri, 16 Sep 2016 21:42:44 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>",
- " Javier Martinez Canillas <javier\@osg.samsung.com>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Marek Szyprowski <m.szyprowski\@samsung.com>",
- " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Alban Browaeys <alban.browaeys\@gmail.com>",
- " Marc Zyngier <marc.zyngier\@arm.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -108,7 +95,7 @@
" \t};\n",
" \n",
"\@\@ -112,7 +112,7 \@\@\n",
- " \tg2d: g2d\@10800000 {\n",
+ " \tg2d: g2d at 10800000 {\n",
" \t\tcompatible = \"samsung,exynos4212-g2d\";\n",
" \t\treg = <0x10800000 0x1000>;\n",
"-\t\tinterrupts = <0 89 0>;\n",
@@ -117,7 +104,7 @@
" \t\tclock-names = \"sclk_fimg2d\", \"fimg2d\";\n",
" \t\tiommus = <&sysmmu_g2d>;\n",
"\@\@ -127,7 +127,7 \@\@\n",
- " \t\tfimc_lite_0: fimc-lite\@12390000 {\n",
+ " \t\tfimc_lite_0: fimc-lite at 12390000 {\n",
" \t\t\tcompatible = \"samsung,exynos4212-fimc-lite\";\n",
" \t\t\treg = <0x12390000 0x1000>;\n",
"-\t\t\tinterrupts = <0 105 0>;\n",
@@ -126,7 +113,7 @@
" \t\t\tclocks = <&clock CLK_FIMC_LITE0>;\n",
" \t\t\tclock-names = \"flite\";\n",
"\@\@ -138,7 +138,7 \@\@\n",
- " \t\tfimc_lite_1: fimc-lite\@123A0000 {\n",
+ " \t\tfimc_lite_1: fimc-lite at 123A0000 {\n",
" \t\t\tcompatible = \"samsung,exynos4212-fimc-lite\";\n",
" \t\t\treg = <0x123A0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 106 0>;\n",
@@ -135,7 +122,7 @@
" \t\t\tclocks = <&clock CLK_FIMC_LITE1>;\n",
" \t\t\tclock-names = \"flite\";\n",
"\@\@ -149,7 +149,8 \@\@\n",
- " \t\tfimc_is: fimc-is\@12000000 {\n",
+ " \t\tfimc_is: fimc-is at 12000000 {\n",
" \t\t\tcompatible = \"samsung,exynos4212-fimc-is\", \"simple-bus\";\n",
" \t\t\treg = <0x12000000 0x260000>;\n",
"-\t\t\tinterrupts = <0 90 0>, <0 95 0>;\n",
@@ -145,7 +132,7 @@
" \t\t\tclocks = <&clock CLK_FIMC_LITE0>,\n",
" \t\t\t\t <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,\n",
"\@\@ -200,7 +201,7 \@\@\n",
- " \tmshc_0: mmc\@12550000 {\n",
+ " \tmshc_0: mmc at 12550000 {\n",
" \t\tcompatible = \"samsung,exynos4412-dw-mshc\";\n",
" \t\treg = <0x12550000 0x1000>;\n",
"-\t\tinterrupts = <0 77 0>;\n",
@@ -220,4 +207,4 @@
"2.7.4"
]
-e9b4f8de6e18fcc58c5599aa2992be6ab8ed7ad7fcdf6def445eeb1623bbce8f
+7092e3bc030fb2fd0d0ea43129bb69255a5366174f0f5bffc212f5043d09a028
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.