diff for duplicates of <1425467965-26461-1-git-send-email-nicolas.ferre@atmel.com>
diff --git a/a/1.txt b/N1/1.txt
index 2219804..de311e6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,11 +13,11 @@ index f95ba32e29a5..93e6e1f0c729 100644
};
};
-+ i2c0: i2c@f8014000 {
++ i2c0: i2c at f8014000 {
+ status = "okay";
+ };
+
- macb0: ethernet@f8020000 {
+ macb0: ethernet at f8020000 {
phy-mode = "rmii";
status = "okay";
--
diff --git a/a/content_digest b/N1/content_digest
index 69c5f93..f96b5de 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001425437508-30976-2-git-send-email-josh.wu\@atmel.com\0"
]
[
- "From\0Nicolas Ferre <nicolas.ferre\@atmel.com>\0"
+ "From\0nicolas.ferre\@atmel.com (Nicolas Ferre)\0"
]
[
"Subject\0[PATCH] ARM: at91/dt: sama5d4 xplained: add i2c0\0"
@@ -11,14 +11,7 @@
"Date\0Wed, 4 Mar 2015 12:19:25 +0100\0"
]
[
- "To\0<linux-arm-kernel\@lists.infradead.org>",
- " <linux-kernel\@vger.kernel.org>\0"
-]
-[
- "Cc\0Josh Wu <josh.wu\@atmel.com>",
- " Alexandre Belloni <alexandre.belloni\@free-electrons.com>",
- " Boris BREZILLON <boris.brezillon\@free-electrons.com>",
- " Nicolas Ferre <nicolas.ferre\@atmel.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -42,15 +35,15 @@
" \t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- "+\t\t\ti2c0: i2c\@f8014000 {\n",
+ "+\t\t\ti2c0: i2c at f8014000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tmacb0: ethernet\@f8020000 {\n",
+ " \t\t\tmacb0: ethernet at f8020000 {\n",
" \t\t\t\tphy-mode = \"rmii\";\n",
" \t\t\t\tstatus = \"okay\";\n",
"-- \n",
"2.1.3"
]
-d91487fd742c47b22141e055b02dcf8e6405afcb7155f4e3053f9fae0e6201d6
+cc32263bb65568a1ce8e851e8c4a2345a5ccd303995e3c9df687e304dd099720
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.