commit | 74807afd3f4eb403e490b5db7af1ece117262f5b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 27 14:42:18 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 27 14:42:18 2014 -0700 |
tree | 2a3cb1fbf3a4b613f4d9b45af88bcda6bdd56713 | |
parent | cd40fab6dbf4173c1617557be720dcec89657866 [diff] | |
parent | 8a574cfa2652545eb95595d38ac2a0bb501af0ae [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Pull MIPS fixes from Ralf Baechle: "The final round of fixes. One corner case in the math emulator and another one in the mcount function for ftrace" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: mcount: Adjust stack pointer for static trace in MIPS32 MIPS: Fix MFC1 & MFHC1 emulation for 64-bit MIPS systems