Re: [GIT PULL] at91: dt for 4.1 #1

[Arnd Bergmann]

On Saturday 07 March 2015 17:12:01 Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
> 
> This is a first batch of DT updates for 4.1. You'll find many little nodes
> added to several chips and boards. The bulk of it is related to sama5d4 though.
> Sama5d4 Xplained board is also added during this cycle.

Pulled into next/dt.
 
> Please note that this tag is stacked on top of my first at91-fixes pull-request
> that you already took. This is due to a conflict that shows up in the aliases
> section of sama5d4.dtsi.
> I did this to avoid having to deal with this conflict for the whole cycle. If
> you want me to do someting else, please tell me.

No, this is exactly the right way to deal with the conflict, thanks!

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/