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

2013-09-05 Thread Stephen Rothwell
Hi all, On Thu, 05 Sep 2013 22:58:17 -0400 (EDT) David Miller wrote: > > From: Olof Johansson > 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. > > > > Si

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

2013-09-05 Thread David Miller
From: Olof Johansson 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 > --- > > This breaks a handful of defconfigs on ARM, so i