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

[Simon Horman]

On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote:
> Hi Olof,
> 
> On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <olof at lixom.net> wrote:
> >
> > Now I can't resolve it properly and move the entries when I do the
> > same merge (and get the same conflict), because that will cause a
> > third conflict for Stephen, and he's about to return from vacation and
> > is going to cuss at us if we cause too many new conflicts in one day.
> > :)
> 
> Since I have now been made aware of the issue, you might as well just
> sort it in the merge.  And I have never been known to "cuss", though
> ranting is a possibility :-)


Rant accepted. I will be more careful in future.