[PATCHv4 10/10] arm/dts: am57xx-beagle-x15.dts: add HDMI

[Tomi Valkeinen]

On 02/06/15 00:51, Tony Lindgren wrote:
> * Tomi Valkeinen <tomi.valkeinen at ti.com> [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: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/63f23774/attachment.sig>