All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <66c405e72bf332e59ab29461e33a4e94cb8bdd7a.1403487225.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index fe1be5b..d67bcc6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ This patch adds a default PCIe bus clock node.
 
 Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
 Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-[horms+renesas@verge.net.au: resolved conflict]
+[horms+renesas at verge.net.au: resolved conflict]
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
  arch/arm/boot/dts/r8a7791.dtsi | 9 +++++++++
@@ -28,7 +28,7 @@ index a15bf7a..7f7eda7 100644
 +		};
 +
  		/* Special CPG clocks */
- 		cpg_clocks: cpg_clocks@e6150000 {
+ 		cpg_clocks: cpg_clocks at e6150000 {
  			compatible = "renesas,r8a7791-cpg-clocks",
 -- 
 2.0.0.rc2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 45a2068..97a96cb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1403487225.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 25/29] ARM: shmobile: r8a7791: Add default PCIe bus clock\0"
 ]
 [
-  "Date\0Mon, 23 Jun 2014 02:28:34 +0000\0"
+  "Date\0Mon, 23 Jun 2014 11:28:34 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -26,7 +26,7 @@
   "\n",
   "Signed-off-by: Phil Edworthy <phil.edworthy\@renesas.com>\n",
   "Acked-by: Laurent Pinchart <laurent.pinchart\@ideasonboard.com>\n",
-  "[horms+renesas\@verge.net.au: resolved conflict]\n",
+  "[horms+renesas at verge.net.au: resolved conflict]\n",
   "Signed-off-by: Simon Horman <horms+renesas\@verge.net.au>\n",
   "---\n",
   " arch/arm/boot/dts/r8a7791.dtsi | 9 +++++++++\n",
@@ -50,10 +50,10 @@
   "+\t\t};\n",
   "+\n",
   " \t\t/* Special CPG clocks */\n",
-  " \t\tcpg_clocks: cpg_clocks\@e6150000 {\n",
+  " \t\tcpg_clocks: cpg_clocks at e6150000 {\n",
   " \t\t\tcompatible = \"renesas,r8a7791-cpg-clocks\",\n",
   "-- \n",
   "2.0.0.rc2"
 ]
 
-91deadc9c58c47ad72c0f71f46cc12d5da80521dbd43a26cbd167f4dc4fb599e
+f4aee5db256b4444c6850de0e3280f071421ffe057fadc7b50ead7b8105e202d
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.