diff for duplicates of <157fcd8a3e6fb46ad99b615838afe16e8fcebd61.1415059587.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index f0326b7..cd8eb83 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,7 +14,7 @@ index 050e608..ad5df80 100644
status = "disabled";
};
-+ xhci: usb@ee000000 {
++ xhci: usb at ee000000 {
+ compatible = "renesas,xhci-r8a7790";
+ reg = <0 0xee000000 0 0xc00>;
+ interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
@@ -24,7 +24,7 @@ index 050e608..ad5df80 100644
+ status = "disabled";
+ };
+
- pci0: pci@ee090000 {
+ pci0: pci at ee090000 {
compatible = "renesas,pci-r8a7790";
device_type = "pci";
--
diff --git a/a/content_digest b/N1/content_digest
index 19f3425..a55ca3f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1415059587.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 20/34] ARM: shmobile: r8a7790: add USB3.0 device node\0"
]
[
- "Date\0Tue, 04 Nov 2014 01:50:50 +0000\0"
+ "Date\0Tue, 4 Nov 2014 10:50:50 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -36,7 +36,7 @@
" \t\tstatus = \"disabled\";\n",
" \t};\n",
" \n",
- "+\txhci: usb\@ee000000 {\n",
+ "+\txhci: usb at ee000000 {\n",
"+\t\tcompatible = \"renesas,xhci-r8a7790\";\n",
"+\t\treg = <0 0xee000000 0 0xc00>;\n",
"+\t\tinterrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -46,11 +46,11 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- " \tpci0: pci\@ee090000 {\n",
+ " \tpci0: pci at ee090000 {\n",
" \t\tcompatible = \"renesas,pci-r8a7790\";\n",
" \t\tdevice_type = \"pci\";\n",
"-- \n",
"2.1.1"
]
-9cf491aedfadd8806cc7ff519c33064173ef607e4e2a751ca7ed23112636d1cd
+a3b2dac7d721607db2def4971c209a94c9633a0dbbf4a0edd20ca1e887619ba2
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.