diff for duplicates of <5329AAE1.7030705@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 15c4153..419efaa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -149,7 +149,7 @@ by U-Boot */ + clock-names = "stmmaceth"; }; - gmac1: ethernet at ff702000 { + gmac1: ethernet@ff702000 { @@ -466,8 +468,10 @@ altr,sysmgr-syscon = <&sysmgr 0x60>; reg = <0xff702000 0x2000>; @@ -161,4 +161,4 @@ by U-Boot */ + clock-names = "stmmaceth"; }; - L2: l2-cache at fffef000 { + L2: l2-cache@fffef000 { diff --git a/a/content_digest b/N1/content_digest index 19fcabd..0e9b436 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,19 @@ "ref\0201403191333.01095.arnd@arndb.de\0" "ref\053299CA8.607@gmail.com\0" "ref\04337501.shzGE38xmF@wuerfel\0" - "From\0dinh.linux@gmail.com (Dinh Nguyen)\0" - "Subject\0stmmac-socfpga breakage in arm-soc\0" + "From\0Dinh Nguyen <dinh.linux@gmail.com>\0" + "Subject\0Re: stmmac-socfpga breakage in arm-soc\0" "Date\0Wed, 19 Mar 2014 09:34:09 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Dinh Nguyen <dinguyen@altera.com>" + Srinivas Kandagatla <srinivas.kandagatla@st.com> + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + Hans de Goede <hdegoede@redhat.com> + arm@kernel.org + Giuseppe Cavallaro <peppe.cavallaro@st.com> + David S. Miller <davem@davemloft.net> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" @@ -158,7 +167,7 @@ "+ clock-names = \"stmmaceth\";\n" " };\n" "\n" - " gmac1: ethernet at ff702000 {\n" + " gmac1: ethernet@ff702000 {\n" "@@ -466,8 +468,10 @@\n" " altr,sysmgr-syscon = <&sysmgr 0x60>;\n" " reg = <0xff702000 0x2000>;\n" @@ -170,6 +179,6 @@ "+ clock-names = \"stmmaceth\";\n" " };\n" "\n" - L2: l2-cache at fffef000 { + L2: l2-cache@fffef000 { -7af2d760da64442adc58f091da5f78295f4cae156160bb8016b3d5e9e88418d1 +4682e06e999b260285c626727511829ccd47fea573530fdf900a616c03825b17
diff --git a/a/1.txt b/N2/1.txt index 15c4153..419efaa 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -149,7 +149,7 @@ by U-Boot */ + clock-names = "stmmaceth"; }; - gmac1: ethernet at ff702000 { + gmac1: ethernet@ff702000 { @@ -466,8 +468,10 @@ altr,sysmgr-syscon = <&sysmgr 0x60>; reg = <0xff702000 0x2000>; @@ -161,4 +161,4 @@ by U-Boot */ + clock-names = "stmmaceth"; }; - L2: l2-cache at fffef000 { + L2: l2-cache@fffef000 { diff --git a/a/content_digest b/N2/content_digest index 19fcabd..590da46 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,19 @@ "ref\0201403191333.01095.arnd@arndb.de\0" "ref\053299CA8.607@gmail.com\0" "ref\04337501.shzGE38xmF@wuerfel\0" - "From\0dinh.linux@gmail.com (Dinh Nguyen)\0" - "Subject\0stmmac-socfpga breakage in arm-soc\0" + "From\0Dinh Nguyen <dinh.linux@gmail.com>\0" + "Subject\0Re: stmmac-socfpga breakage in arm-soc\0" "Date\0Wed, 19 Mar 2014 09:34:09 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Srinivas Kandagatla <srinivas.kandagatla@st.com>" + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + Hans de Goede <hdegoede@redhat.com> + arm@kernel.org + linux-arm-kernel@lists.infradead.org + Giuseppe Cavallaro <peppe.cavallaro@st.com> + David S. Miller <davem@davemloft.net> + " Dinh Nguyen <dinguyen@altera.com>\0" "\00:1\0" "b\0" "Hi Arnd,\n" @@ -158,7 +167,7 @@ "+ clock-names = \"stmmaceth\";\n" " };\n" "\n" - " gmac1: ethernet at ff702000 {\n" + " gmac1: ethernet@ff702000 {\n" "@@ -466,8 +468,10 @@\n" " altr,sysmgr-syscon = <&sysmgr 0x60>;\n" " reg = <0xff702000 0x2000>;\n" @@ -170,6 +179,6 @@ "+ clock-names = \"stmmaceth\";\n" " };\n" "\n" - L2: l2-cache at fffef000 { + L2: l2-cache@fffef000 { -7af2d760da64442adc58f091da5f78295f4cae156160bb8016b3d5e9e88418d1 +a84808c797129d93d007b1f5f7721c628d1850e71dd2b5582874fc1972053d94
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.