Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

diff --combined arch/powerpc/kernel/traps.c
index e4d1713,4d0b4e7..9b352bd
--- 1/arch/powerpc/kernel/traps.c
--- 2/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@@ -148,7 -148,7 +148,7 @@@ int die(const char *str, struct pt_reg
                panic("Fatal exception in interrupt");
  
        if (panic_on_oops)
 -              panic("Fatal exception: panic_on_oops");
 +              panic("Fatal exception");
  
        do_exit(err);
  
@@@ -585,14 -585,14 +585,14 @@@ static void parse_fpe(struct pt_regs *r
  #define INST_MFSPR_PVR_MASK   0xfc1fffff
  
  #define INST_DCBA             0x7c0005ec
- #define INST_DCBA_MASK                0x7c0007fe
+ #define INST_DCBA_MASK                0xfc0007fe
  
  #define INST_MCRXR            0x7c000400
- #define INST_MCRXR_MASK               0x7c0007fe
+ #define INST_MCRXR_MASK               0xfc0007fe
  
  #define INST_STRING           0x7c00042a
- #define INST_STRING_MASK      0x7c0007fe
- #define INST_STRING_GEN_MASK  0x7c00067e
+ #define INST_STRING_MASK      0xfc0007fe
+ #define INST_STRING_GEN_MASK  0xfc00067e
  #define INST_LSWI             0x7c0004aa
  #define INST_LSWX             0x7c00042a
  #define INST_STSWI            0x7c0005aa