diff for duplicates of <56b7271c9dbf029d288e4fbcae72e405e56ae856.1424849129.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index cb1e2fb..a6488a8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,7 +7,7 @@ Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Specify the device interrupt to avoid polling for end of conversion.
-While at it rename the DT node to compass@c to describe the device's
+While at it rename the DT node to compass at c to describe the device's
function instead of its model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
@@ -25,14 +25,14 @@ index 0134d53..873b415 100644
&i2c0 {
status = "okay";
-+ compass@c {
++ compass at c {
+ compatible = "asahi-kasei,ak8975";
+ reg = <0x0c>;
+ interrupt-parent = <&irqpin3>;
+ interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+ };
+
- ak4648: codec@12 {
+ ak4648: codec at 12 {
compatible = "asahi-kasei,ak4648";
reg = <0x12>;
--
diff --git a/a/content_digest b/N1/content_digest
index 4bdc166..207d098 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1424849129.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 04/32] ARM: shmobile: kzm9g-reference dts: Add ak8975 magnetometer node\0"
]
[
- "Date\0Thu, 26 Feb 2015 06:21:01 +0000\0"
+ "Date\0Thu, 26 Feb 2015 15:21:01 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -29,7 +29,7 @@
"\n",
"Specify the device interrupt to avoid polling for end of conversion.\n",
"\n",
- "While at it rename the DT node to compass\@c to describe the device's\n",
+ "While at it rename the DT node to compass at c to describe the device's\n",
"function instead of its model.\n",
"\n",
"Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas\@ideasonboard.com>\n",
@@ -47,18 +47,18 @@
" &i2c0 {\n",
" \tstatus = \"okay\";\n",
" \n",
- "+\tcompass\@c {\n",
+ "+\tcompass at c {\n",
"+\t\tcompatible = \"asahi-kasei,ak8975\";\n",
"+\t\treg = <0x0c>;\n",
"+\t\tinterrupt-parent = <&irqpin3>;\n",
"+\t\tinterrupts = <4 IRQ_TYPE_EDGE_FALLING>;\n",
"+\t};\n",
"+\n",
- " \tak4648: codec\@12 {\n",
+ " \tak4648: codec at 12 {\n",
" \t\tcompatible = \"asahi-kasei,ak4648\";\n",
" \t\treg = <0x12>;\n",
"-- \n",
"2.1.4"
]
-8bca527337e4a6a64a8d3c5d562b8986c41af09720cb3558f122dfc6e846e191
+feff12b1c36bb507719c41eb848b42c38f2798ea9a87810f54d5a02c342aaf51
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.