diff for duplicates of <201306032158.49791.heiko@sntech.de> diff --git a/a/1.txt b/N1/1.txt index faa9225..cee1469 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,13 +35,13 @@ index 93e2b0f..eb2327b 100644 + Example: - timer1: timer at ffc09000 { + timer1: timer@ffc09000 { @@ -23,3 +34,11 @@ Example: clock-frequency = <200000000>; reg = <0xffd00000 0x1000>; }; + -+ timer3: timer at ffe00000 { ++ timer3: timer@ffe00000 { + compatible = "snps,dw-apb-timer-osc"; + interrupts = <0 170 4>; + reg = <0xffe00000 0x1000>; diff --git a/a/content_digest b/N1/content_digest index 174116d..27d6195 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ "ref\0201306032157.40488.heiko@sntech.de\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH 2/3] clocksource: dw_apb_timer_of: add clock-handling\0" "Date\0Mon, 3 Jun 2013 21:58:49 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jamie Iles <jamie@jamieiles.com>\0" + "Cc\0Dinh Nguyen <dinguyen@altera.com>" + Grant Likely <grant.likely@linaro.org> + linux-arm-kernel@lists.infradead.org + Rob Herring <rob.herring@calxeda.com> + John Stultz <john.stultz@linaro.org> + Thomas Gleixner <tglx@linutronix.de> + devicetree-discuss@lists.ozlabs.org + linux-kernel@vger.kernel.org + " Arnd Bergmann <arnd@arndb.de>\0" "\00:1\0" "b\0" "Add the possibility to get the clock-frequency from a timer clock instead\n" @@ -42,13 +51,13 @@ "+\n" " Example:\n" " \n" - " \t\ttimer1: timer at ffc09000 {\n" + " \t\ttimer1: timer@ffc09000 {\n" "@@ -23,3 +34,11 @@ Example:\n" " \t\t\t\tclock-frequency = <200000000>;\n" " \t\t\t\treg = <0xffd00000 0x1000>;\n" " \t\t\t};\n" "+\n" - "+\t\ttimer3: timer at ffe00000 {\n" + "+\t\ttimer3: timer@ffe00000 {\n" "+\t\t\t\tcompatible = \"snps,dw-apb-timer-osc\";\n" "+\t\t\t\tinterrupts = <0 170 4>;\n" "+\t\t\t\treg = <0xffe00000 0x1000>;\n" @@ -109,4 +118,4 @@ "-- \n" 1.7.2.3 -f9c95351c66d5f7bf598cd61c908eaa80b383715360ea5aa0faa0a90489a9d7e +8c72408a1b72e5deee5774768e60f255a65268e3ff7885f01ca31842db77ca4c
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.