diff for duplicates of <7b07bd69cd506effa716c41f8ec3dda7a7c6c563.1491405475.git-series.gregory.clement@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index 3e280db..ece1a82 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,7 +27,7 @@ index 86602c907a61..e749c5727490 100644
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi_quad_pins>;
- m25p80@0 {
+ m25p80 at 0 {
compatible = "jedec,spi-nor";
@@ -103,6 +107,8 @@
@@ -82,7 +82,7 @@ index c02b13479458..2ac25f54d01d 100644
+ };
};
- pinctrl_sb: pinctrl-sb@18800 {
+ pinctrl_sb: pinctrl-sb at 18800 {
@@ -203,6 +228,12 @@
<GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
@@ -95,6 +95,6 @@ index c02b13479458..2ac25f54d01d 100644
+
};
- eth0: ethernet@30000 {
+ eth0: ethernet at 30000 {
--
git-series 0.9.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 2771e13..bffee8d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.65d0e6796fecf1fe6c5d07b981160b54dc9b4acd.1491405475.git-series.gregory.clement\@free-electrons.com\0"
]
[
- "From\0Gregory CLEMENT <gregory.clement\@free-electrons.com>\0"
+ "From\0gregory.clement\@free-electrons.com (Gregory CLEMENT)\0"
]
[
"Subject\0[PATCH v4 7/7] ARM64: dts: marvell: armada37xx: add pinctrl definition\0"
@@ -11,25 +11,7 @@
"Date\0Wed, 5 Apr 2017 17:18:08 +0200\0"
]
[
- "To\0Linus Walleij <linus.walleij\@linaro.org>",
- " linux-gpio\@vger.kernel.org\0"
-]
-[
- "Cc\0Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Gregory CLEMENT <gregory.clement\@free-electrons.com>",
- " Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Victor Gu <xigu\@marvell.com>",
- " Marcin Wojtas <mw\@semihalf.com>",
- " Wilson Ding <dingwei\@marvell.com>",
- " Hua Jing <jinghua\@marvell.com>",
- " Neta Zur Hershkovits <neta\@marvell.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -67,7 +49,7 @@
"+\tpinctrl-names = \"default\";\n",
"+\tpinctrl-0 = <&spi_quad_pins>;\n",
" \n",
- " \tm25p80\@0 {\n",
+ " \tm25p80 at 0 {\n",
" \t\tcompatible = \"jedec,spi-nor\";\n",
"\@\@ -103,6 +107,8 \@\@\n",
" \n",
@@ -122,7 +104,7 @@
"+\t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- " \t\t\tpinctrl_sb: pinctrl-sb\@18800 {\n",
+ " \t\t\tpinctrl_sb: pinctrl-sb at 18800 {\n",
"\@\@ -203,6 +228,12 \@\@\n",
" \t\t\t\t\t<GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,\n",
" \t\t\t\t\t<GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -135,9 +117,9 @@
"+\n",
" \t\t\t};\n",
" \n",
- " \t\t\teth0: ethernet\@30000 {\n",
+ " \t\t\teth0: ethernet at 30000 {\n",
"-- \n",
"git-series 0.9.1"
]
-526ad46ded73fff3e48d0f59c23ca5ecbf8f796b52285e8aaeb0dbf643099838
+a1ed11d184165f4cdc4b6a8bbd7963178c542126ab8200649d8335be71d72728
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.