From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [PATCHv4 10/10] arm/dts: am57xx-beagle-x15.dts: add HDMI Date: Tue, 2 Jun 2015 09:28:35 +0300 Message-ID: <556D4D13.50509@ti.com> References: <1433139798-23450-1-git-send-email-tomi.valkeinen@ti.com> <1433139798-23450-11-git-send-email-tomi.valkeinen@ti.com> <20150601215115.GH30984@atomide.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xmwTuvposo9kjGvvcHHmGA9roGHeDe44X" Return-path: In-Reply-To: <20150601215115.GH30984-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Tony Lindgren Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org, Tero Kristo , Nishanth Menon , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org --xmwTuvposo9kjGvvcHHmGA9roGHeDe44X Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 02/06/15 00:51, Tony Lindgren wrote: > * Tomi Valkeinen [150531 23:25]: >> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree >> nodes required for HDMI. >=20 > This one does not seem to apply to linux next, did not look > further where it conflicts. Looks like a trivial one line conflict, about adding an alias to .dts. Tomi --xmwTuvposo9kjGvvcHHmGA9roGHeDe44X Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----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----- --xmwTuvposo9kjGvvcHHmGA9roGHeDe44X-- -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html