linux-next: manual merge of the watchdog tree with the arm-soc tree

[Olof Johansson]

On Mon, Mar 7, 2016 at 10:54 AM, Wim Van Sebroeck <wim at iguana.be> wrote:
> Hi All,
>
>> It's much easier for us if all DTS changes go in through the arm-soc
>> trees, to avoid these kind of conflicts. Is this on a branch where you
>> can easily drop it and we pick it up instead, or is it on a now-stable
>> branch?
>>
>>
>> -Olof
>
> I can always redo the tree once you picked it up.

Great, thanks!


-Olof