diff for duplicates of <70496727c08262c69cbeac10dfefada745b46869.1424849129.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 6cf51f1..1816db6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,11 +15,11 @@ index 4b38fc9..24de994 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1465,4 +1465,55 @@
- ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
};
};
+
-+ 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>,
@@ -28,7 +28,7 @@ index 4b38fc9..24de994 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>;
@@ -36,7 +36,7 @@ index 4b38fc9..24de994 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>,
@@ -45,7 +45,7 @@ index 4b38fc9..24de994 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>;
@@ -53,7 +53,7 @@ index 4b38fc9..24de994 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>,
@@ -62,7 +62,7 @@ index 4b38fc9..24de994 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>;
diff --git a/a/content_digest b/N1/content_digest
index 30641f2..92511a5 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 13/32] ARM: shmobile: r8a7790: Add IPMMU DT nodes\0"
]
[
- "Date\0Thu, 26 Feb 2015 06:21:10 +0000\0"
+ "Date\0Thu, 26 Feb 2015 15:21:10 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -37,11 +37,11 @@
"--- a/arch/arm/boot/dts/r8a7790.dtsi\n",
"+++ b/arch/arm/boot/dts/r8a7790.dtsi\n",
"\@\@ -1465,4 +1465,55 \@\@\n",
- " \t\t\tssi9: ssi\@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ " \t\t\tssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };\n",
" \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",
@@ -50,7 +50,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",
@@ -58,7 +58,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",
@@ -67,7 +67,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",
@@ -75,7 +75,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",
@@ -84,7 +84,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",
@@ -96,4 +96,4 @@
"2.1.4"
]
-f5e03fa8c334267b4cf68d7490de4cbf7453fc375a7719244f73d200b85b477b
+a442c8d7b4750cccb019a8c00dff7d599fb4f6c5bde9cb0dbf190d382271c871
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.