diff for duplicates of <20150121183615.GS7718@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 32ebd36..ae9d328 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,7 +81,7 @@ Tony interrupt-parent = <&gic>; }; -+ local-timer@48240600 { ++ local-timer at 48240600 { + compatible = "arm,cortex-a9-twd-timer"; + clocks = <&dpll_mpu_m2_ck>; + reg = <0x48240600 0x20>; @@ -89,7 +89,7 @@ Tony + interrupt-parent = <&gic>; + }; + - wakeupgen: interrupt-controller@48281000 { + wakeupgen: interrupt-controller at 48281000 { compatible = "ti,omap4-wugen-mpu"; interrupt-controller; --- a/arch/arm/kernel/smp_twd.c diff --git a/a/content_digest b/N1/content_digest index 496dfef..1555952 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,32 +2,10 @@ "ref\01421660655-21394-14-git-send-email-marc.zyngier@arm.com\0" "ref\020150121163031.GR7718@atomide.com\0" "ref\054BFE05E.9080403@arm.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH v4 13/21] ARM: omap: convert wakeupgen to stacked domains\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v4 13/21] ARM: omap: convert wakeupgen to stacked domains\0" "Date\0Wed, 21 Jan 2015 10:36:16 -0800\0" - "To\0Marc Zyngier <marc.zyngier@arm.com>\0" - "Cc\0Nishanth Menon <nm@ti.com>" - Mark Rutland <Mark.Rutland@arm.com> - Linus Walleij <linus.walleij@linaro.org> - Stefan Agner <stefan@agner.ch> - Thierry Reding <thierry.reding@gmail.com> - Jason Cooper <jason@lakedaemon.net> - Alexandre Courbot <gnurou@gmail.com> - Kukjin Kim <kgene.kim@samsung.com> - Pankaj Dubey <pankaj.dubey@samsung.com> - Magnus Damm <magnus.damm@gmail.com> - Michal Simek <michal.simek@xilinx.com> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - Benoit Cousson <bcousson@baylibre.com> - Stephen Warren <swarren@wwwdotorg.org> - Simon Horman <horms@verge.net.au> - Santosh Shilimkar <ssantosh@kernel.org> - Thomas Gleixner <tglx@linutronix.de> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - Felipe Balbi <balbi@ti.com> - Rob Herring <robh+dt@kernel.org> - " Sasc\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Marc Zyngier <marc.zyngier@arm.com> [150121 09:25]:\n" @@ -113,7 +91,7 @@ " \t\tinterrupt-parent = <&gic>;\n" " \t};\n" " \n" - "+\tlocal-timer@48240600 {\n" + "+\tlocal-timer at 48240600 {\n" "+\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "+\t\tclocks = <&dpll_mpu_m2_ck>;\n" "+\t\treg = <0x48240600 0x20>;\n" @@ -121,7 +99,7 @@ "+\t\tinterrupt-parent = <&gic>;\n" "+\t};\n" "+\n" - " \twakeupgen: interrupt-controller@48281000 {\n" + " \twakeupgen: interrupt-controller at 48281000 {\n" " \t\tcompatible = \"ti,omap4-wugen-mpu\";\n" " \t\tinterrupt-controller;\n" "--- a/arch/arm/kernel/smp_twd.c\n" @@ -147,4 +125,4 @@ " \t.restart\t= omap44xx_restart,\n" MACHINE_END -07930d93966a23c8d4a7c91452cbd016ddc88804381105ccc3b7408d9b0d5a1e +30105a7ec897c8c5d2c095ca32d3d2fa6bd41178b97b1788b7d5dcf20aa14cd4
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.