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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/