diff for duplicates of <20130318151021.28231.51294.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 883d365..d3f1f64 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> reg = <0x40000000 0x40000000>; }; + -+ ape6evm_fixed_3v3: fixedregulator@0 { ++ ape6evm_fixed_3v3: fixedregulator at 0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; @@ -33,7 +33,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + regulator-always-on; + }; + -+ ethernet@8000000 { ++ ethernet at 8000000 { + compatible = "smsc,lan9118", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; diff --git a/a/content_digest b/N1/content_digest index ce726ba..efd4f36 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130318150953.28231.73454.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/03] ARM: shmobile: APE6EVM LAN9220 support\0" - "Date\0Mon, 18 Mar 2013 15:10:21 +0000\0" + "Date\0Tue, 19 Mar 2013 00:10:21 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -32,7 +32,7 @@ " \t\treg = <0x40000000 0x40000000>;\n" " \t};\n" "+\n" - "+\tape6evm_fixed_3v3: fixedregulator@0 {\n" + "+\tape6evm_fixed_3v3: fixedregulator at 0 {\n" "+\t\tcompatible = \"regulator-fixed\";\n" "+\t\tregulator-name = \"3V3\";\n" "+\t\tregulator-min-microvolt = <3300000>;\n" @@ -40,7 +40,7 @@ "+\t\tregulator-always-on;\n" "+\t};\n" "+\n" - "+\tethernet@8000000 {\n" + "+\tethernet at 8000000 {\n" "+\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "+\t\treg = <0x08000000 0x1000>;\n" "+\t\tinterrupt-parent = <&irqc1>;\n" @@ -121,4 +121,4 @@ " \n" static const char *ape6evm_boards_compat_dt[] __initdata = { -2882f42107682e10b02facc7e61b44891b22ad1893734e5e37a9269649db14d3 +c5f6585ad2ee9432e38b310ff0bdce88976fb01ed17264ccda13d169de346067
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.