diff for duplicates of <521CD111.9030905@wwwdotorg.org> diff --git a/a/1.txt b/N1/1.txt index 6f3197a..892d4e7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ On 08/27/2013 02:29 AM, Stephen Rothwell wrote: > diff --cc arch/arm/boot/dts/tegra20-trimslice.dts -> usb@c5000000 { status = "okay"; - nvidia,vbus-gpio = <&gpio +> usb at c5000000 { status = "okay"; - nvidia,vbus-gpio = <&gpio > TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; }; That chunk isn't part of either of the two commits above. diff --git a/a/content_digest b/N1/content_digest index fd2811e..859431e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\020130827182935.ff4005b60cc1ce80d32d5e46@canb.auug.org.au\0" - "From\0Stephen Warren <swarren@wwwdotorg.org>\0" - "Subject\0Re: linux-next: manual merge of the arm-soc tree with Linus' tree\0" + "From\0swarren@wwwdotorg.org (Stephen Warren)\0" + "Subject\0linux-next: manual merge of the arm-soc tree with Linus' tree\0" "Date\0Tue, 27 Aug 2013 10:17:21 -0600\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0Olof 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 - " Stephen Warren <swarren@nvidia.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 08/27/2013 02:29 AM, Stephen Rothwell wrote:\n" @@ -25,7 +19,7 @@ "\n" "> diff --cc arch/arm/boot/dts/tegra20-trimslice.dts\n" "\n" - "> usb@c5000000 { status = \"okay\"; -\t\tnvidia,vbus-gpio = <&gpio\n" + "> usb at c5000000 { status = \"okay\"; -\t\tnvidia,vbus-gpio = <&gpio\n" "> TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; };\n" "\n" "That chunk isn't part of either of the two commits above.\n" @@ -39,4 +33,4 @@ "issue would be with me not having too much git merge conflict\n" resolution experience:-) -d7d105dc242d1cefe7a0fc8319861494a6adaa47f41596ec8eb2201ee4573978 +e20fe203e89c78e499bc46e19cd21bd8e84f527f4ed9c438df12352a3a87a8bd
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.