diff for duplicates of <20131023121903.GT15154@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 5922173..eefd620 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ Tony > + > + / { > + cpus { -> + cpu@0 { +> + cpu at 0 { > + cpu0-supply = <&vcc>; > + }; > + }; @@ -66,7 +66,7 @@ Tony > + &i2c1 { > + clock-frequency = <2600000>; > + -> + twl: twl@48 { +> + twl: twl at 48 { > + reg = <0x48>; > + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ > + interrupt-parent = <&intc>; @@ -86,7 +86,7 @@ Tony > + /* > + * TVP5146 Video decoder-in for analog input support. > + */ -> + tvp5146@5c { +> + tvp5146 at 5c { > + compatible = "ti,tvp5146m2"; > + reg = <0x5c>; > + }; @@ -119,7 +119,7 @@ Tony > + }; > + > + &gpmc { -> + ethernet@gpmc { +> + ethernet at gpmc { > + interrupt-parent = <&gpio6>; > + interrupts = <16 8>; > + reg = <5 0 0xff>; diff --git a/a/content_digest b/N1/content_digest index 4a4c04e..12c4918 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01382369814-7582-1-git-send-email-treding@nvidia.com\0" "ref\01382454649-16442-1-git-send-email-treding@nvidia.com\0" "ref\01382454649-16442-4-git-send-email-treding@nvidia.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: linux-next: manual merge of the arm-soc tree\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0linux-next: manual merge of the arm-soc tree\0" "Date\0Wed, 23 Oct 2013 05:19:03 -0700\0" - "To\0Thierry Reding <thierry.reding@gmail.com>\0" - "Cc\0Kishon Vijay Abraham I <kishon@ti.com>" - Greg KH <greg@kroah.com> - Olof Johansson <olof@lixom.net> - Arnd Bergmann <arnd@arndb.de> - linux-arm-kernel@lists.infradead.org - linux-next@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Thierry Reding <thierry.reding@gmail.com> [131022 08:13]:\n" @@ -53,7 +46,7 @@ "> + \n" "> + / {\n" "> + \tcpus {\n" - "> + \t\tcpu@0 {\n" + "> + \t\tcpu at 0 {\n" "> + \t\t\tcpu0-supply = <&vcc>;\n" "> + \t\t};\n" "> + \t};\n" @@ -82,7 +75,7 @@ "> + &i2c1 {\n" "> + \tclock-frequency = <2600000>;\n" "> + \n" - "> + \ttwl: twl@48 {\n" + "> + \ttwl: twl at 48 {\n" "> + \t\treg = <0x48>;\n" "> + \t\tinterrupts = <7>; /* SYS_NIRQ cascaded to intc */\n" "> + \t\tinterrupt-parent = <&intc>;\n" @@ -102,7 +95,7 @@ "> + \t/*\n" "> + \t * TVP5146 Video decoder-in for analog input support.\n" "> + \t */\n" - "> + \ttvp5146@5c {\n" + "> + \ttvp5146 at 5c {\n" "> + \t\tcompatible = \"ti,tvp5146m2\";\n" "> + \t\treg = <0x5c>;\n" "> + \t};\n" @@ -135,11 +128,11 @@ "> + };\n" "> + \n" "> + &gpmc {\n" - "> + \tethernet@gpmc {\n" + "> + \tethernet at gpmc {\n" "> + \t\tinterrupt-parent = <&gpio6>;\n" "> + \t\tinterrupts = <16 8>;\n" "> + \t\treg = <5 0 0xff>;\n" "> + \t};\n" > + }; -3329104945412a44a5d6277d66b8946291d4716a2a8ea240887b56a948a09ebf +888d09926e89a4a4a1047aa1aaf8aa577200e724a740896edd8a3d5c57891748
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.