linux-next: manual merge of the thermal tree with the imx-mxs tree

[Shawn Guo]

On Wed, Oct 18, 2017 at 09:47:26AM +0800, Zhang Rui wrote:
> Shawn,
> 
> https://patchwork.kernel.org/patch/9841191/
> https://patchwork.kernel.org/patch/9841193/
> Should I drop these two dts patches and leave them to you?

Okay, let's do that to avoid the conflict.

Shawn