Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sparc/math-emu/math_32.c b/arch/sparc/math-emu/math_32.c
index aa4d55b0bdf0..5ce8f2f64604 100644
--- a/arch/sparc/math-emu/math_32.c
+++ b/arch/sparc/math-emu/math_32.c
@@ -499,7 +499,7 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs)
                 case 0: fsr = *pfsr;
                         if (IR == -1) IR = 2;
                         /* fcc is always fcc0 */
-                        fsr &= ~0xc00; fsr |= (IR << 10); break;
+                        fsr &= ~0xc00; fsr |= (IR << 10);
                         *pfsr = fsr;
                         break;
                 case 1: rd->s = IR; break;