projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd40fab 8a574cf)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Sep 2014 21:42:18 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Sep 2014 21:42:18 +0000 (14:42 -0700)
commit74807afd3f4eb403e490b5db7af1ece117262f5b
tree2a3cb1fbf3a4b613f4d9b45af88bcda6bdd56713tree | snapshot
parentcd40fab6dbf4173c1617557be720dcec89657866commit | diff
parent8a574cfa2652545eb95595d38ac2a0bb501af0aecommit | diff
Merge branch 'upstream' of git://git.linux-mips.org/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
John Crispins staging tree