diff for duplicates of <20120511194249.6567.21685.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 4d42969..b159f2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,15 +33,15 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + interrupt-parent = <&gic>; + + cpus { -+ cpu@0 { ++ cpu at 0 { + compatible = "arm,cortex-a9"; + }; -+ cpu@1 { ++ cpu at 1 { + compatible = "arm,cortex-a9"; + }; + }; + -+ gic: interrupt-controller@e0020000 { ++ gic: interrupt-controller at e0020000 { + compatible = "arm,cortex-a9-gic"; + interrupt-controller; + #interrupt-cells = <3>; @@ -58,31 +58,31 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + reg = <0x40000000 0x8000000>; /* 128 MB */ + }; + -+ sti@e0180000 { ++ sti at e0180000 { + compatible = "renesas,em-sti"; + reg = <0xe0180000 0x54>; + interrupts = <0 125 0>; + }; + -+ uart@e1020000 { ++ uart at e1020000 { + compatible = "renesas,em-uart"; + reg = <0xe1020000 0x38>; + interrupts = <0 8 0>; + }; + -+ uart@e1030000 { ++ uart at e1030000 { + compatible = "renesas,em-uart"; + reg = <0xe1030000 0x38>; + interrupts = <0 9 0>; + }; + -+ uart@e1040000 { ++ uart at e1040000 { + compatible = "renesas,em-uart"; + reg = <0xe1040000 0x38>; + interrupts = <0 10 0>; + }; + -+ uart@e1050000 { ++ uart at e1050000 { + compatible = "renesas,em-uart"; + reg = <0xe1050000 0x38>; + interrupts = <0 11 0>; diff --git a/a/content_digest b/N1/content_digest index e92bb7f..2ae5a9d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120511194151.6567.53888.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 06/06] mach-shmobile: Emma Mobile EV2 DT support V2\0" - "Date\0Fri, 11 May 2012 19:42:49 +0000\0" + "Date\0Sat, 12 May 2012 04:42:49 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -40,15 +40,15 @@ "+\tinterrupt-parent = <&gic>;\n" "+\n" "+\tcpus {\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tcompatible = \"arm,cortex-a9\";\n" "+\t\t};\n" - "+\t\tcpu@1 {\n" + "+\t\tcpu at 1 {\n" "+\t\t\tcompatible = \"arm,cortex-a9\";\n" "+\t\t};\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" "+\t\t#interrupt-cells = <3>;\n" @@ -65,31 +65,31 @@ "+\t\treg = <0x40000000 0x8000000>; /* 128 MB */\n" "+\t};\n" "+\n" - "+\tsti@e0180000 {\n" + "+\tsti at e0180000 {\n" "+\t\tcompatible = \"renesas,em-sti\";\n" "+\t\treg = <0xe0180000 0x54>;\n" "+\t\tinterrupts = <0 125 0>;\n" "+ };\n" "+\n" - "+\tuart@e1020000 {\n" + "+\tuart at e1020000 {\n" "+\t\tcompatible = \"renesas,em-uart\";\n" "+\t\treg = <0xe1020000 0x38>;\n" "+\t\tinterrupts = <0 8 0>;\n" "+ };\n" "+\n" - "+\tuart@e1030000 {\n" + "+\tuart at e1030000 {\n" "+\t\tcompatible = \"renesas,em-uart\";\n" "+\t\treg = <0xe1030000 0x38>;\n" "+\t\tinterrupts = <0 9 0>;\n" "+ };\n" "+\n" - "+\tuart@e1040000 {\n" + "+\tuart at e1040000 {\n" "+\t\tcompatible = \"renesas,em-uart\";\n" "+\t\treg = <0xe1040000 0x38>;\n" "+\t\tinterrupts = <0 10 0>;\n" "+ };\n" "+\n" - "+\tuart@e1050000 {\n" + "+\tuart at e1050000 {\n" "+\t\tcompatible = \"renesas,em-uart\";\n" "+\t\treg = <0xe1050000 0x38>;\n" "+\t\tinterrupts = <0 11 0>;\n" @@ -186,4 +186,4 @@ "+\n" +#endif /* CONFIG_USE_OF */ -8fe043436279955225128cdc60d45266257824bbe37aafe54aac1fb7256031ec +84b69291bb11b978363bd801ab10f2f2d725e0536ca9f2c01af60c32bb6c2de2
diff --git a/a/content_digest b/N2/content_digest index e92bb7f..26f20a0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\020120511194151.6567.53888.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 06/06] mach-shmobile: Emma Mobile EV2 DT support V2\0" - "Date\0Fri, 11 May 2012 19:42:49 +0000\0" + "Date\0Sat, 12 May 2012 04:42:49 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0horms@verge.net.au" + linux@arm.linux.org.uk + arnd@arndb.de + linux-sh@vger.kernel.org + linux-kernel@vger.kernel.org + rjw@sisk.pl + lethal@linux-sh.org + olof@lixom.net + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "From: Magnus Damm <damm@opensource.se>\n" @@ -186,4 +195,4 @@ "+\n" +#endif /* CONFIG_USE_OF */ -8fe043436279955225128cdc60d45266257824bbe37aafe54aac1fb7256031ec +93b9e29a08f0239413d698f6b208a6024d590212684dec3d68c83b10ea47637c
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.