diff for duplicates of <5c9e276095a9607f530f94e219daf2996b1360fa.1424849129.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index ef90c0a..fbc5ac1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -19,13 +19,13 @@ index 6d32c87..0134d53 100644
&i2c0 {
status = "okay";
+
-+ ak4648: codec@12 {
++ ak4648: codec at 12 {
+ compatible = "asahi-kasei,ak4648";
+ reg = <0x12>;
+ #sound-dai-cells = <0>;
+ };
+
- as3711@40 {
+ as3711 at 40 {
compatible = "ams,as3711";
reg = <0x40>;
@@ -258,12 +265,6 @@
@@ -33,7 +33,7 @@ index 6d32c87..0134d53 100644
};
};
-
-- ak4648: ak4648@12 {
+- ak4648: ak4648 at 12 {
- #sound-dai-cells = <0>;
- compatible = "asahi-kasei,ak4648";
- reg = <0x12>;
diff --git a/a/content_digest b/N1/content_digest
index 4e466f6..35f6808 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 03/32] ARM: shmobile: kzm9g-reference dts: Sort i2c0 children by unit address\0"
]
[
- "Date\0Thu, 26 Feb 2015 06:21:00 +0000\0"
+ "Date\0Thu, 26 Feb 2015 15:21:00 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -41,13 +41,13 @@
" &i2c0 {\n",
" \tstatus = \"okay\";\n",
"+\n",
- "+\tak4648: codec\@12 {\n",
+ "+\tak4648: codec at 12 {\n",
"+\t\tcompatible = \"asahi-kasei,ak4648\";\n",
"+\t\treg = <0x12>;\n",
"+\t\t#sound-dai-cells = <0>;\n",
"+\t};\n",
"+\n",
- " \tas3711\@40 {\n",
+ " \tas3711 at 40 {\n",
" \t\tcompatible = \"ams,as3711\";\n",
" \t\treg = <0x40>;\n",
"\@\@ -258,12 +265,6 \@\@\n",
@@ -55,7 +55,7 @@
" \t\t};\n",
" \t};\n",
"-\n",
- "-\tak4648: ak4648\@12 {\n",
+ "-\tak4648: ak4648 at 12 {\n",
"-\t\t#sound-dai-cells = <0>;\n",
"-\t\tcompatible = \"asahi-kasei,ak4648\";\n",
"-\t\treg = <0x12>;\n",
@@ -67,4 +67,4 @@
"2.1.4"
]
-8a4a3b41c04c1aae4ad0ddfcb527da3e68d3322cd052977302b8eebc0f76a862
+0f8c484c22844e0f46ace663f074b61bd2bcfc1bcae88dd0c531a1c6d9be41ed
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.