diff for duplicates of <556D4D13.50509@ti.com> diff --git a/a/1.txt b/N1/1.txt index 1e930c2..7b1ce80 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On 02/06/15 00:51, Tony Lindgren wrote: -> * Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org> [150531 23:25]: +> * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]: >> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree >> nodes required for HDMI. > @@ -11,3 +11,11 @@ On 02/06/15 00:51, Tony Lindgren wrote: Looks like a trivial one line conflict, about adding an alias to .dts. Tomi + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 819 bytes +Desc: OpenPGP digital signature +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/63f23774/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index 8c4ee5a..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVbU0WAAoJEPo9qoy8lh71BLEP/il3GWl7678InS793LTa3XJO -mSMM0G+f9c1YeaMLs63OYzWFZAnZ1+ljl1CSCYIs8TCeu2JP0+ZsH7c+ivKB8H4F -JAYap4EznQi+SaoQseU+QuaTuEpbZ1y7LMsA6hk/8nfLrb1QHrE1dtfIuKa0HxXI -uII4E68eRgtKOoRXQZtWjX1uRyD6QgBTByr+kkQxi5OcJk49oOoAfOrH66D0f7yZ -4YiycE8mjD/4cXg2slE6qNfRLvvKrQY2svoUCsQDVyxx+hUEKxIbmq5/j8uv5KFQ -R0LMtQKEenyjRIQp/0KRPVQnZm5eTT+hEJbN2CbqhOG/b6GLEyRtsgyLPWCWPpoy -5FlIgTNUNk01MlhjAaYdmioVd0znvlm7XAY6t8lCTFBENE7MSA9D9gJ3hAuWL7Gj -ViZ984OR8gFZdVyD8VpQ4ApD+IymCei88mwOQ9nnkVsVHNOd671u3TNJykLgCYAD -IeKwQvjgo/i6JKc/7i2czJYHOJh+5TMwCTQHw1C1eWuW+GVEriLipG7PXYepM2Wu -Ue69pye56tNkjTWyXxaUUSFg7BUzV76TzRaPhTxhtHukmFXvPTxQgLiptKa+YgFo -1RDyE/c+zxCG6DbbvkcMgYx8iZyYqwAyhDOFD/hZa2AUohOoJvIrHFzc5rdEI8zB -SPFBW+X5qD1poq3uxUr4 -=5DOj ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index a198b95..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: OpenPGP digital signature -Content-Disposition: attachment; filename="signature.asc" diff --git a/a/content_digest b/N1/content_digest index c70ca20..b10a0ca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,16 @@ "ref\01433139798-23450-1-git-send-email-tomi.valkeinen@ti.com\0" "ref\01433139798-23450-11-git-send-email-tomi.valkeinen@ti.com\0" "ref\020150601215115.GH30984@atomide.com\0" - "ref\020150601215115.GH30984-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org\0" - "From\0Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org>\0" - "Subject\0Re: [PATCHv4 10/10] arm/dts: am57xx-beagle-x15.dts: add HDMI\0" + "From\0tomi.valkeinen@ti.com (Tomi Valkeinen)\0" + "Subject\0[PATCHv4 10/10] arm/dts: am57xx-beagle-x15.dts: add HDMI\0" "Date\0Tue, 2 Jun 2015 09:28:35 +0300\0" - "To\0Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" - "Cc\0linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org - Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org> - Nishanth Menon <nm-l0cyMroinI0@public.gmane.org> - " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "\n" "\n" "On 02/06/15 00:51, Tony Lindgren wrote:\n" - "> * Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org> [150531 23:25]:\n" + "> * Tomi Valkeinen <tomi.valkeinen@ti.com> [150531 23:25]:\n" ">> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree\n" ">> nodes required for HDMI.\n" "> \n" @@ -26,27 +19,14 @@ "\n" "Looks like a trivial one line conflict, about adding an alias to .dts.\n" "\n" - Tomi - "\01:2\0" - "fn\0signature.asc\0" - "d\0OpenPGP digital signature\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v2\n" + " Tomi\n" "\n" - "iQIcBAEBCAAGBQJVbU0WAAoJEPo9qoy8lh71BLEP/il3GWl7678InS793LTa3XJO\n" - "mSMM0G+f9c1YeaMLs63OYzWFZAnZ1+ljl1CSCYIs8TCeu2JP0+ZsH7c+ivKB8H4F\n" - "JAYap4EznQi+SaoQseU+QuaTuEpbZ1y7LMsA6hk/8nfLrb1QHrE1dtfIuKa0HxXI\n" - "uII4E68eRgtKOoRXQZtWjX1uRyD6QgBTByr+kkQxi5OcJk49oOoAfOrH66D0f7yZ\n" - "4YiycE8mjD/4cXg2slE6qNfRLvvKrQY2svoUCsQDVyxx+hUEKxIbmq5/j8uv5KFQ\n" - "R0LMtQKEenyjRIQp/0KRPVQnZm5eTT+hEJbN2CbqhOG/b6GLEyRtsgyLPWCWPpoy\n" - "5FlIgTNUNk01MlhjAaYdmioVd0znvlm7XAY6t8lCTFBENE7MSA9D9gJ3hAuWL7Gj\n" - "ViZ984OR8gFZdVyD8VpQ4ApD+IymCei88mwOQ9nnkVsVHNOd671u3TNJykLgCYAD\n" - "IeKwQvjgo/i6JKc/7i2czJYHOJh+5TMwCTQHw1C1eWuW+GVEriLipG7PXYepM2Wu\n" - "Ue69pye56tNkjTWyXxaUUSFg7BUzV76TzRaPhTxhtHukmFXvPTxQgLiptKa+YgFo\n" - "1RDyE/c+zxCG6DbbvkcMgYx8iZyYqwAyhDOFD/hZa2AUohOoJvIrHFzc5rdEI8zB\n" - "SPFBW+X5qD1poq3uxUr4\n" - "=5DOj\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: 819 bytes\n" + "Desc: OpenPGP digital signature\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/63f23774/attachment.sig> -2189e2aeba2eb4fab84bfe147a7ffcd3577bedee0c150c9dac48262896a92314 +01d2ba45d69dbfe87bcf7fe480731fe7b9f1bef6a5c22938f06070365e668f1f
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.