diff for duplicates of <5628AA1C.4090305@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 1ee2f37..9be0f8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ index eee636d..51ad4a9 100644 + ti,timer-pwm; }; - timer5: timer@48046000 { + timer5: timer at 48046000 { @@ -330,6 +331,7 @@ reg = <0x48046000 0x2000>; interrupts = <93>; @@ -26,7 +26,7 @@ index eee636d..51ad4a9 100644 + ti,timer-pwm; }; - timer6: timer@48048000 { + timer6: timer at 48048000 { @@ -337,6 +339,7 @@ reg = <0x48048000 0x2000>; interrupts = <94>; @@ -34,7 +34,7 @@ index eee636d..51ad4a9 100644 + ti,timer-pwm; }; - timer7: timer@4804a000 { + timer7: timer at 4804a000 { @@ -344,6 +347,7 @@ reg = <0x4804a000 0x2000>; interrupts = <95>; @@ -42,6 +42,6 @@ index eee636d..51ad4a9 100644 + ti,timer-pwm; }; - uart1: uart@48020000 { + uart1: uart at 48020000 { -- 1.9.1 diff --git a/a/content_digest b/N1/content_digest index 91b6e6f..ebe5d07 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,7 @@ - "From\0Neil Armstrong <narmstrong@baylibre.com>\0" + "From\0narmstrong@baylibre.com (Neil Armstrong)\0" "Subject\0[PATCH 3/4] arm: dts: add dm816x pwm property to timers\0" "Date\0Thu, 22 Oct 2015 11:19:24 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>" - " Paul Walmsley <paul@pwsan.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - Brian Hutchinson <b.hutchman@gmail.com> - fisaksen@baylibre.com - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Adds ti,timer-pwm property to timers 4 to 7 to permit usage of their\n" @@ -31,7 +24,7 @@ "+\t\t\tti,timer-pwm;\n" " \t\t};\n" "\n" - " \t\ttimer5: timer@48046000 {\n" + " \t\ttimer5: timer at 48046000 {\n" "@@ -330,6 +331,7 @@\n" " \t\t\treg = <0x48046000 0x2000>;\n" " \t\t\tinterrupts = <93>;\n" @@ -39,7 +32,7 @@ "+\t\t\tti,timer-pwm;\n" " \t\t};\n" "\n" - " \t\ttimer6: timer@48048000 {\n" + " \t\ttimer6: timer at 48048000 {\n" "@@ -337,6 +339,7 @@\n" " \t\t\treg = <0x48048000 0x2000>;\n" " \t\t\tinterrupts = <94>;\n" @@ -47,7 +40,7 @@ "+\t\t\tti,timer-pwm;\n" " \t\t};\n" "\n" - " \t\ttimer7: timer@4804a000 {\n" + " \t\ttimer7: timer at 4804a000 {\n" "@@ -344,6 +347,7 @@\n" " \t\t\treg = <0x4804a000 0x2000>;\n" " \t\t\tinterrupts = <95>;\n" @@ -55,8 +48,8 @@ "+\t\t\tti,timer-pwm;\n" " \t\t};\n" "\n" - " \t\tuart1: uart@48020000 {\n" + " \t\tuart1: uart at 48020000 {\n" "-- \n" 1.9.1 -1ec477b6a374a55b2d7bbdc12b10784a9a39804c6f53b1ad121c4dbc82a3ba5c +729cb838f95acb9178ad0e80351c2213378d7f6f3e7b26a274ac2eeb25264114
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.