diff for duplicates of <1348492306.2361.48.camel@deskari> diff --git a/a/1.txt b/N1/1.txt index 22bdba5..b2adc41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,3 +31,11 @@ Linus doesn't really like merges just for the sake of fixing conflicts. So far all the omapdss conflicts seem trivial, though. Tomi + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 836 bytes +Desc: This is a digitally signed message part +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120924/42ef092e/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index cf34d51..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQIcBAABAgAGBQJQYFwSAAoJEPo9qoy8lh71EJIQAKtPQwbbQhXVyqxv2aT3j0V+ -CJnIpJ2Ohh3DEtq+xfVMg4Q74m4Ux/o0AP8KuYLqoOd9baS6h68iEmq7qHROziH/ -TE/E5sk7RyMDLCgGZQv2f0+xSdcG37Uw6941jHd4d1Yeox7JchOOTWzgSZf6K9sj -Fq/geFm5Sru9yWkyOfQK8+ber+3mA2LzlHhBlCCTV4aQiWim+19D+xLCiqsuu7Uw -dGqR6F+QtALklNVzxJHe6RTOm7iUpPyJSRCqcrikzQk0G4jq29kezXiUUvSyoCwb -Bo61T5zwkTc/W4DAGSsYFydSznmwK23JD6oAQSvb0JKuGrjp1POrfHYwTOiVlO9N -SoH7Pa1txrVxmIKSui4v4wTy9NIBFjq62JZ8+uriQvmDbLOFHZQ8F+sQFgTBwMvX -SCheZHtEqbyNEfXiIMXxGYuUcU+UtygSGVnPHl/zGzwb9+WOKyS6Pg1C2eTXAy/6 -HfF9iFGwNyeup22NtZ6jAaiiy/jZd6s4XY+QI69yfHJvgRTBmlGknXY+CprmoDWE -yGsD4GCkyBtq43AOrHwc4ufy7q83aL4JQZX4jbRbs4DdYCbw09oA0UhzqS3cShdR -GbG6Iprj9rHWHzsZuA93FVRlEGTxrdpNhzoQ8xeNuDWwfcCOV2iZJ4q8CFYS4Xgv -fijtLwYSCZlgSy+BwFyF -=5H6r ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index da6d245..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: This is a digitally signed message part -Content-Transfer-Encoding: 7bit diff --git a/a/content_digest b/N1/content_digest index 7c1100b..51c793a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\020120924195305.588277e94ce701abc5e5a6c5@canb.auug.org.au\0" "ref\0201209241243.39462.arnd@arndb.de\0" - "From\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" - "Subject\0Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree\0" + "From\0tomi.valkeinen@ti.com (Tomi Valkeinen)\0" + "Subject\0linux-next: manual merge of the arm-soc tree with the omap_dss2 tree\0" "Date\0Mon, 24 Sep 2012 16:11:46 +0300\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>" - Olof Johansson <olof@lixom.net> - linux-arm-kernel@lists.infradead.org - linux-next@vger.kernel.org - linux-kernel@vger.kernel.org - " Tony Lindgren <tony@atomide.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi Arnd,\n" "\n" @@ -44,27 +38,14 @@ "\n" "So far all the omapdss conflicts seem trivial, though.\n" "\n" - Tomi - "\01:2\0" - "fn\0signature.asc\0" - "d\0This is a digitally signed message part\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v1.4.11 (GNU/Linux)\n" + " Tomi\n" "\n" - "iQIcBAABAgAGBQJQYFwSAAoJEPo9qoy8lh71EJIQAKtPQwbbQhXVyqxv2aT3j0V+\n" - "CJnIpJ2Ohh3DEtq+xfVMg4Q74m4Ux/o0AP8KuYLqoOd9baS6h68iEmq7qHROziH/\n" - "TE/E5sk7RyMDLCgGZQv2f0+xSdcG37Uw6941jHd4d1Yeox7JchOOTWzgSZf6K9sj\n" - "Fq/geFm5Sru9yWkyOfQK8+ber+3mA2LzlHhBlCCTV4aQiWim+19D+xLCiqsuu7Uw\n" - "dGqR6F+QtALklNVzxJHe6RTOm7iUpPyJSRCqcrikzQk0G4jq29kezXiUUvSyoCwb\n" - "Bo61T5zwkTc/W4DAGSsYFydSznmwK23JD6oAQSvb0JKuGrjp1POrfHYwTOiVlO9N\n" - "SoH7Pa1txrVxmIKSui4v4wTy9NIBFjq62JZ8+uriQvmDbLOFHZQ8F+sQFgTBwMvX\n" - "SCheZHtEqbyNEfXiIMXxGYuUcU+UtygSGVnPHl/zGzwb9+WOKyS6Pg1C2eTXAy/6\n" - "HfF9iFGwNyeup22NtZ6jAaiiy/jZd6s4XY+QI69yfHJvgRTBmlGknXY+CprmoDWE\n" - "yGsD4GCkyBtq43AOrHwc4ufy7q83aL4JQZX4jbRbs4DdYCbw09oA0UhzqS3cShdR\n" - "GbG6Iprj9rHWHzsZuA93FVRlEGTxrdpNhzoQ8xeNuDWwfcCOV2iZJ4q8CFYS4Xgv\n" - "fijtLwYSCZlgSy+BwFyF\n" - "=5H6r\n" - "-----END PGP SIGNATURE-----\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: signature.asc\n" + "Type: application/pgp-signature\n" + "Size: 836 bytes\n" + "Desc: This is a digitally signed message part\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120924/42ef092e/attachment.sig> -3213823ecc48b8fc68218a0446b7ce83349464cf529d17d0842554aaecd34eda +2bff4cdf2171f325c808b858905c4ad657de7ffc2ee09251a5295d75ceba1881
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.