diff for duplicates of <20130306002243.5430.27806.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index eef17bc..5fb6539 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,13 +19,13 @@ Signed-off-by: Magnus Damm <damm@opensource.se> }; }; -+ timer@e0030600 { ++ timer at e0030600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0xe0030600 0x20>; + interrupts = <1 1 0xf04>; + }; + - gic: interrupt-controller@e0020000 { + gic: interrupt-controller at e0020000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; --- 0001/arch/arm/mach-shmobile/clock-emev2.c diff --git a/a/content_digest b/N1/content_digest index 4c30073..8d1530b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130306002214.5430.43766.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/04] ARM: shmobile: Add EMEV2 TWD support\0" - "Date\0Wed, 06 Mar 2013 00:22:43 +0000\0" + "Date\0Wed, 06 Mar 2013 09:22:43 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -26,13 +26,13 @@ " \t\t};\n" " \t};\n" " \n" - "+\ttimer@e0030600 {\n" + "+\ttimer at e0030600 {\n" "+\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "+\t\treg = <0xe0030600 0x20>;\n" "+\t\tinterrupts = <1 1 0xf04>;\n" "+\t};\n" "+\n" - " \tgic: interrupt-controller@e0020000 {\n" + " \tgic: interrupt-controller at e0020000 {\n" " \t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\tinterrupt-controller;\n" "--- 0001/arch/arm/mach-shmobile/clock-emev2.c\n" @@ -109,4 +109,4 @@ " {\n" " \tgic_secondary_init(0);" -52b5b831395301d7f71a13a0d5f361b3b47302df15809049cdd24af34c790c83 +fcc7c49faf90bda60485a2d19a27cbdc1c390139802fbd28d185a44df01faee8
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.