Re: linux-next: manual merge of the staging tree with the char-misc-next tree

[Stephen Rothwell]

Hi Greg,

On Wed, 20 Dec 2017 09:55:57 +0100 Greg KH <g...@kroah.com> wrote:
>
> Looks good!  Sorry for the conflict, I knew it was going to happen :(

I don't mind the trivial ones like this ...

-- 
Cheers,
Stephen Rothwell