Hi all, On Thu, 05 Sep 2013 22:58:17 -0400 (EDT) David Miller <da...@davemloft.net> wrote: > > From: Olof Johansson <o...@lixom.net> > 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 <o...@lixom.net> > > --- > > > > 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 s...@canb.auug.org.au
pgputkdoVt9ya.pgp
Description: PGP signature
