On 02/06/15 00:51, Tony Lindgren wrote: > * Tomi Valkeinen <[email protected]> [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
signature.asc
Description: OpenPGP digital signature
