diff for duplicates of <6cdaa63f9e2b3ea0ac57a71a43f96cf626500d35.1419812186.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index b1167ee..948fede 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index ce085fa..baca8f8 100644
@@ -43,7 +43,7 @@
#size-cells = <1>;
- ethernet@8000000 {
+ ethernet at 8000000 {
- compatible = "smsc,lan9118", "smsc,lan9115";
+ compatible = "smsc,lan9220", "smsc,lan9115";
reg = <0x08000000 0x1000>;
diff --git a/a/content_digest b/N1/content_digest
index 820175c..473135c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1419812185.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 23/30] ARM: shmobile: ape6evm: fix compatible string for Ethernet controller\0"
]
[
- "Date\0Mon, 29 Dec 2014 01:43:54 +0000\0"
+ "Date\0Mon, 29 Dec 2014 10:43:54 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,7 +39,7 @@
"\@\@ -43,7 +43,7 \@\@\n",
" \t\t#size-cells = <1>;\n",
" \n",
- " \t\tethernet\@8000000 {\n",
+ " \t\tethernet at 8000000 {\n",
"-\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n",
"+\t\t\tcompatible = \"smsc,lan9220\", \"smsc,lan9115\";\n",
" \t\t\treg = <0x08000000 0x1000>;\n",
@@ -49,4 +49,4 @@
"2.1.3"
]
-23f1e633625e4445a5d661b4e4b299991a9f09e05b3ecb54e395f81e52aad392
+0e448e10ee788da8f1fa0162699b414a030fabfae0e951208eae305ad4fe134c
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.