diff for duplicates of <69478b2093796860e3991db102ede97131b8d67a.1431565427.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index e2d673e..a21ce28 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,8 +17,8 @@ index 19446273e4a7..1dee0aa4f40c 100644
regulator-boot-on;
};
-- lan9220@20000000 {
-+ ethernet@20000000 {
+- lan9220 at 20000000 {
++ ethernet at 20000000 {
compatible = "smsc,lan9220", "smsc,lan9115";
reg = <0x20000000 0x10000>;
phy-mode = "mii";
@@ -26,8 +26,8 @@ index 19446273e4a7..1dee0aa4f40c 100644
};
&pfc {
-- uart1_pins: uart@e1030000 {
-+ uart1_pins: serial@e1030000 {
+- uart1_pins: uart at e1030000 {
++ uart1_pins: serial at e1030000 {
renesas,groups = "uart1_ctrl", "uart1_data";
renesas,function = "uart1";
};
diff --git a/a/content_digest b/N1/content_digest
index cfbc728..c1d8edf 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 16/31] ARM: shmobile: kzm9d dts: Use generic names for device nodes\0"
]
[
- "Date\0Thu, 14 May 2015 01:06:45 +0000\0"
+ "Date\0Thu, 14 May 2015 10:06:45 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,8 +39,8 @@
" \t\tregulator-boot-on;\n",
" \t};\n",
" \n",
- "-\tlan9220\@20000000 {\n",
- "+\tethernet\@20000000 {\n",
+ "-\tlan9220 at 20000000 {\n",
+ "+\tethernet at 20000000 {\n",
" \t\tcompatible = \"smsc,lan9220\", \"smsc,lan9115\";\n",
" \t\treg = <0x20000000 0x10000>;\n",
" \t\tphy-mode = \"mii\";\n",
@@ -48,8 +48,8 @@
" };\n",
" \n",
" &pfc {\n",
- "-\tuart1_pins: uart\@e1030000 {\n",
- "+\tuart1_pins: serial\@e1030000 {\n",
+ "-\tuart1_pins: uart at e1030000 {\n",
+ "+\tuart1_pins: serial at e1030000 {\n",
" \t\trenesas,groups = \"uart1_ctrl\", \"uart1_data\";\n",
" \t\trenesas,function = \"uart1\";\n",
" \t};\n",
@@ -57,4 +57,4 @@
"2.1.4"
]
-b2e1fe54afb08c3cb706a0c8cd00daeb0d5607f3d92a61c62ed0e071b188d460
+b5efb8865f0f724f42ed3564cfe7957234912586f2536d1f0314980060dd747c
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.