From: tomi.valkeinen@ti.com (Tomi Valkeinen) Date: Tue, 2 Jun 2015 09:28:35 +0300 Subject: [PATCHv4 10/10] arm/dts: am57xx-beagle-x15.dts: add HDMI In-Reply-To: <20150601215115.GH30984@atomide.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> Message-ID: <556D4D13.50509@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. > > 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: