diff for duplicates of <f92d9dc7e6cd15dcd096dc5a4d3e1fe0a034f659.1431565427.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 86c13a1..4a6a86a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,8 +16,8 @@ index 540756cdf391..20afea6f06ef 100644
regulator-always-on;
};
-- lan0@18000000 {
-+ ethernet@18000000 {
+- lan0 at 18000000 {
++ ethernet at 18000000 {
compatible = "smsc,lan9220", "smsc,lan9115";
reg = <0x18000000 0x100>;
- pinctrl-0 = <&lan0_pins>;
diff --git a/a/content_digest b/N1/content_digest
index fff6f18..999a8fe 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1431565427.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 17/31] ARM: shmobile: marzen dts: Use generic names for device nodes\0"
]
[
- "Date\0Thu, 14 May 2015 01:06:46 +0000\0"
+ "Date\0Thu, 14 May 2015 10:06:46 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -38,8 +38,8 @@
" \t\tregulator-always-on;\n",
" \t};\n",
" \n",
- "-\tlan0\@18000000 {\n",
- "+\tethernet\@18000000 {\n",
+ "-\tlan0 at 18000000 {\n",
+ "+\tethernet at 18000000 {\n",
" \t\tcompatible = \"smsc,lan9220\", \"smsc,lan9115\";\n",
" \t\treg = <0x18000000 0x100>;\n",
"-\t\tpinctrl-0 = <&lan0_pins>;\n",
@@ -60,4 +60,4 @@
"2.1.4"
]
-1aa381bba4140a9a3efae9c2f99194ac919c74c3d2f61fad2a6e01b3b5408019
+e147dcf04beb6dc1a399e428c9c2baecb82578cf4ec88f3843d7717ff99b02e4
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.