diff for duplicates of <1415768562-9155-5-git-send-email-caesar.wang@rock-chips.com> diff --git a/a/1.txt b/N1/1.txt index 080dea9..76cb92c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,7 @@ index 9cd269a..c7a2691 100644 + #include "rk3288-thermal.dtsi" + }; + -+ tsadc: tsadc@ff280000 { ++ tsadc: tsadc at ff280000 { + compatible = "rockchip,rk3288-tsadc"; + reg = <0xff280000 0x100>; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; @@ -58,7 +58,7 @@ index 9cd269a..c7a2691 100644 + status = "disabled"; + }; + - usb_host0_ehci: usb@ff500000 { + usb_host0_ehci: usb at ff500000 { compatible = "generic-ehci"; reg = <0xff500000 0x100>; @@ -965,6 +986,12 @@ diff --git a/a/content_digest b/N1/content_digest index 10dbc0a..c6fe078 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,8 @@ "ref\01415768562-9155-1-git-send-email-caesar.wang@rock-chips.com\0" - "From\0Caesar Wang <caesar.wang@rock-chips.com>\0" + "From\0caesar.wang@rock-chips.com (Caesar Wang)\0" "Subject\0[PATCH v18 4/5] ARM: dts: add main Thermal info to rk3288\0" "Date\0Wed, 12 Nov 2014 13:02:41 +0800\0" - "To\0heiko@sntech.de" - rui.zhang@intel.com - " edubezval@gmail.com\0" - "Cc\0zyf@rock-chips.com" - dianders@chromium.org - linux-rockchip@lists.infradead.org - linux-kernel@vger.kernel.org - linux-pm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - linux-doc@vger.kernel.org - cf@rock-chips.com - dmitry.torokhov@gmail.com - huangtao@rock-chips.com - fzf@rock-chips.com - " caesar.wang@rock-chips.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch is depend on rk3288-thermal.dtsi,or\n" @@ -65,7 +50,7 @@ "+\t\t#include \"rk3288-thermal.dtsi\"\n" "+\t};\n" "+\n" - "+\ttsadc: tsadc@ff280000 {\n" + "+\ttsadc: tsadc at ff280000 {\n" "+\t\tcompatible = \"rockchip,rk3288-tsadc\";\n" "+\t\treg = <0xff280000 0x100>;\n" "+\t\tinterrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -80,7 +65,7 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \tusb_host0_ehci: usb@ff500000 {\n" + " \tusb_host0_ehci: usb at ff500000 {\n" " \t\tcompatible = \"generic-ehci\";\n" " \t\treg = <0xff500000 0x100>;\n" "@@ -965,6 +986,12 @@\n" @@ -99,4 +84,4 @@ "-- \n" 1.9.1 -6f55430e341e5f7aa69b791dc8dbfc9ee0cc9da8239f9cde5307f5e187273454 +7e30dbe9bc0597f38b28638fe0c91b737e72446223906a79720b720d221ad5fc
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.