diff for duplicates of <20141028002555.GH7594@dtor-ws> diff --git a/a/1.txt b/N1/1.txt index 27ad98b..ea85e83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > + #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>; @@ -59,7 +59,7 @@ Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > + status = "disabled"; > + }; > + -> usb_host0_ehci: usb@ff500000 { +> usb_host0_ehci: usb at ff500000 { > compatible = "generic-ehci"; > reg = <0xff500000 0x100>; > @@ -965,6 +984,12 @@ diff --git a/a/content_digest b/N1/content_digest index 227832d..f3f2483 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\01414377588-2237-1-git-send-email-caesar.wang@rock-chips.com\0" "ref\01414377588-2237-5-git-send-email-caesar.wang@rock-chips.com\0" - "From\0Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" - "Subject\0Re: [PATCH v14 4/5] ARM: dts: add main Thermal info to rk3288\0" + "From\0dmitry.torokhov@gmail.com (Dmitry Torokhov)\0" + "Subject\0[PATCH v14 4/5] ARM: dts: add main Thermal info to rk3288\0" "Date\0Mon, 27 Oct 2014 17:25:55 -0700\0" - "To\0Caesar Wang <caesar.wang@rock-chips.com>\0" - "Cc\0heiko@sntech.de" - rui.zhang@intel.com - edubezval@gmail.com - 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 - cjf@rock-chips.com - " zhengsq@rock-chips.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Oct 27, 2014 at 10:39:47AM +0800, Caesar Wang wrote:\n" @@ -70,7 +54,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" @@ -83,7 +67,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 +984,12 @@\n" @@ -107,4 +91,4 @@ "-- \n" Dmitry -cb8cf14541971ca1030cdfc2935be0fb577868c1ddab74916e5b70cbdae92c51 +0e1af5841e16594e39829072858de207ae636fbcbdd31aa128d2b79e8ca70e03
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.