Subject: Re: Please pull 'next' branch of 5xxx tree

From: Anatolij Gustschin <[email-masked]>
Date: Wed, 29 Jan 2014 21:50:19 +0100

Hi Ben !

On Wed, 29 Jan 2014 18:46:09 +1100
Benjamin Herrenschmidt <[email-masked]> wrote:
...
> Hrm, I get a merge conflicts with spi-mpc512x-psc.c, please check that I
> fixed it up properly in powerpc-next and let me know.

your fix is correct.

Thanks,

Anatolij