diff for duplicates of <1411900693-30484-5-git-send-email-caesar.wang@rock-chips.com> diff --git a/a/1.txt b/N1/1.txt index 5b1b243..8ffd50c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ index 36be7bb..79102b6 100644 + #include "rk3xxx-cpu-thermal.dtsi" + }; + -+ tsadc: tsadc@ff280000 { ++ tsadc: tsadc at ff280000 { + compatible = "rockchip,rk3288-tsadc"; + reg = <0xff280000 0x100>; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; @@ -39,7 +39,7 @@ index 36be7bb..79102b6 100644 + status = "disabled"; + }; + - usb_host0_ehci: usb@ff500000 { + usb_host0_ehci: usb at ff500000 { compatible = "generic-ehci"; reg = <0xff500000 0x100>; @@ -611,5 +629,11 @@ diff --git a/a/content_digest b/N1/content_digest index ad96b70..89ac05f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,8 @@ "ref\01411900693-30484-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 v7 4/5] ARM: dts: add main Thermal info to rk3288\0" "Date\0Sun, 28 Sep 2014 18:38:12 +0800\0" - "To\0heiko@sntech.de" - rui.zhang@intel.com - " edubezval@gmail.com\0" - "Cc\0dmitry.torokhov@gmail.com" - arnd@arndb.de - zyf@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 - dbasehore@chromium.org - huangtao@rock-chips.com - " Caesar Wang <caesar.wang@rock-chips.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch is depend on rk3xxx-cpu-thermal.dtsi,or\n" @@ -49,7 +33,7 @@ "+\t\t#include \"rk3xxx-cpu-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" @@ -62,7 +46,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" "@@ -611,5 +629,11 @@\n" @@ -80,4 +64,4 @@ "-- \n" 1.9.1 -ec08bf4d5e08c6ffbd77bb5998dd2a17f92bb1f4f98d3a84067b14b561ec87f9 +d47b4b5dada8c1e40e5a872157347e1a69c202fbc7f46530b0c7ec5ad2120e81
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.