diff for duplicates of <098cb3a601e6a6afcf1d0c15bc939a57732242a4.1447981420.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 5ef26e8..b3bcd0d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index c4654047e684..fcafa87616fa 100644
};
};
-+ ipmmu_sy0: mmu@e6280000 {
++ ipmmu_sy0: mmu at e6280000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xe6280000 0 0x1000>;
+ interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,
@@ -26,7 +26,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_sy1: mmu@e6290000 {
++ ipmmu_sy1: mmu at e6290000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xe6290000 0 0x1000>;
+ interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;
@@ -34,7 +34,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_ds: mmu@e6740000 {
++ ipmmu_ds: mmu at e6740000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xe6740000 0 0x1000>;
+ interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
@@ -43,7 +43,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_mp: mmu@ec680000 {
++ ipmmu_mp: mmu at ec680000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xec680000 0 0x1000>;
+ interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;
@@ -51,7 +51,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_mx: mmu@fe951000 {
++ ipmmu_mx: mmu at fe951000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xfe951000 0 0x1000>;
+ interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
@@ -60,7 +60,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_rt: mmu@ffc80000 {
++ ipmmu_rt: mmu at ffc80000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xffc80000 0 0x1000>;
+ interrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;
@@ -68,7 +68,7 @@ index c4654047e684..fcafa87616fa 100644
+ status = "disabled";
+ };
+
-+ ipmmu_gp: mmu@e62a0000 {
++ ipmmu_gp: mmu at e62a0000 {
+ compatible = "renesas,ipmmu-vmsa";
+ reg = <0 0xe62a0000 0 0x1000>;
+ interrupts = <0 260 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/a/content_digest b/N1/content_digest
index 32f16f1..b3e3999 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1447981420.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 09/29] ARM: shmobile: r8a7793: Add IPMMU nodes\0"
]
[
- "Date\0Fri, 20 Nov 2015 01:05:16 +0000\0"
+ "Date\0Thu, 19 Nov 2015 17:05:16 -0800\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,7 +39,7 @@
" \t\t};\n",
" \t};\n",
" \n",
- "+\tipmmu_sy0: mmu\@e6280000 {\n",
+ "+\tipmmu_sy0: mmu at e6280000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xe6280000 0 0x1000>;\n",
"+\t\tinterrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -48,7 +48,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_sy1: mmu\@e6290000 {\n",
+ "+\tipmmu_sy1: mmu at e6290000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xe6290000 0 0x1000>;\n",
"+\t\tinterrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -56,7 +56,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_ds: mmu\@e6740000 {\n",
+ "+\tipmmu_ds: mmu at e6740000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xe6740000 0 0x1000>;\n",
"+\t\tinterrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -65,7 +65,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_mp: mmu\@ec680000 {\n",
+ "+\tipmmu_mp: mmu at ec680000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xec680000 0 0x1000>;\n",
"+\t\tinterrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -73,7 +73,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_mx: mmu\@fe951000 {\n",
+ "+\tipmmu_mx: mmu at fe951000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xfe951000 0 0x1000>;\n",
"+\t\tinterrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -82,7 +82,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_rt: mmu\@ffc80000 {\n",
+ "+\tipmmu_rt: mmu at ffc80000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xffc80000 0 0x1000>;\n",
"+\t\tinterrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -90,7 +90,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tipmmu_gp: mmu\@e62a0000 {\n",
+ "+\tipmmu_gp: mmu at e62a0000 {\n",
"+\t\tcompatible = \"renesas,ipmmu-vmsa\";\n",
"+\t\treg = <0 0xe62a0000 0 0x1000>;\n",
"+\t\tinterrupts = <0 260 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -103,4 +103,4 @@
"2.1.4"
]
-6be36c16c7d696b91e5e80b23fb60be444ee7d150572ad2ef9f29e24022d8e92
+adfa43ee4115a531ff17bd8039553ec55de566ba6d8aa47a3e402706e382d1fc
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.