Re: [PATCH] net: stmmac: fix bad merge conflict resolution

[Stephen Rothwell]

Hi all,

On Thu, 05 Sep 2013 22:58:17 -0400 (EDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: Olof Johansson <olof@xxxxxxxxx>
> Date: Thu,  5 Sep 2013 18:01:41 -0700
> 
> > Merge commit 06c54055bebf919249aa1eb68312887c3cfe77b4 did a bad conflict
> > resolution accidentally leaving out a closing brace. Add it back.
> > 
> > Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
> > ---
> > 
> > This breaks a handful of defconfigs on ARM, so it'd be good to see it
> > applied pretty quickly. Thanks!
> 
> Looks like Linus applied this, thanks Olof.

And I cherry-picked it into linux-next for today.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature