diff for duplicates of <1468679348-10522-6-git-send-email-jm@lentin.co.uk>
diff --git a/a/content_digest b/N1/content_digest
index 43de926..5067cf8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -20,10 +20,10 @@
]
[
"Cc\0devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " netdev\@vger.kernel.org",
+ " Jamie Lentin <jm\@lentin.co.uk>",
" linux-kernel\@vger.kernel.org",
- " Jamie Lentin <jm\@lentin.co.uk>\0"
+ " linux-arm-kernel\@lists.infradead.org",
+ " netdev\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -96,4 +96,4 @@
"2.8.1"
]
-c81774f19593ea6ee313e88f79e5ce7f2f14e77de3e8487e3b96da3f65c9ba2e
+1bd820d5f4bbca38912a3f9da6c8376263fece505b795f1b43752bae36c99b47
diff --git a/a/1.txt b/N2/1.txt
index fc2503a..5802867 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -40,18 +40,18 @@ index 0000000..b51e7ac
+ compatible = "marvell,orion5x-88f5181-mbus", "simple-bus";
+
+ internal-regs {
-+ pinctrl: pinctrl@10000 {
++ pinctrl: pinctrl at 10000 {
+ compatible = "marvell,88f5181-pinctrl";
+ reg = <0x10000 0x8>, <0x10050 0x4>;
+ };
+
-+ core_clk: core-clocks@10030 {
++ core_clk: core-clocks at 10030 {
+ compatible = "marvell,mv88f5181-core-clock";
+ reg = <0x10010 0x4>;
+ #clock-cells = <1>;
+ };
+
-+ mbusc: mbus-controller@20000 {
++ mbusc: mbus-controller at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x100>, <0x1500 0x20>;
+ };
diff --git a/a/content_digest b/N2/content_digest
index 43de926..036c7bf 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001468679348-10522-1-git-send-email-jm\@lentin.co.uk\0"
]
[
- "From\0Jamie Lentin <jm\@lentin.co.uk>\0"
+ "From\0jm\@lentin.co.uk (Jamie Lentin)\0"
]
[
"Subject\0[PATCH v0 05/10] arm: orion5x: Add DT include for mv88f5181\0"
@@ -11,19 +11,7 @@
"Date\0Sat, 16 Jul 2016 15:29:03 +0100\0"
]
[
- "To\0Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Gregory Clement <gregory.clement\@free-electrons.com>",
- " Imre Kaloz <kaloz\@openwrt.org>",
- " Florian Fainelli <f.fainelli\@gmail.com>\0"
-]
-[
- "Cc\0devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " netdev\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Jamie Lentin <jm\@lentin.co.uk>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -74,18 +62,18 @@
"+\t\tcompatible = \"marvell,orion5x-88f5181-mbus\", \"simple-bus\";\n",
"+\n",
"+\t\tinternal-regs {\n",
- "+\t\t\tpinctrl: pinctrl\@10000 {\n",
+ "+\t\t\tpinctrl: pinctrl at 10000 {\n",
"+\t\t\t\tcompatible = \"marvell,88f5181-pinctrl\";\n",
"+\t\t\t\treg = <0x10000 0x8>, <0x10050 0x4>;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tcore_clk: core-clocks\@10030 {\n",
+ "+\t\t\tcore_clk: core-clocks at 10030 {\n",
"+\t\t\t\tcompatible = \"marvell,mv88f5181-core-clock\";\n",
"+\t\t\t\treg = <0x10010 0x4>;\n",
"+\t\t\t\t#clock-cells = <1>;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tmbusc: mbus-controller\@20000 {\n",
+ "+\t\t\tmbusc: mbus-controller at 20000 {\n",
"+\t\t\t\tcompatible = \"marvell,mbus-controller\";\n",
"+\t\t\t\treg = <0x20000 0x100>, <0x1500 0x20>;\n",
"+\t\t\t};\n",
@@ -96,4 +84,4 @@
"2.8.1"
]
-c81774f19593ea6ee313e88f79e5ce7f2f14e77de3e8487e3b96da3f65c9ba2e
+b4078ae0cafa22781481287eb7b17fa9518afba6ca9b6842c13cddedc5e44da6
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.