projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd4edf7 8b3c569)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Oct 2013 18:24:58 +0000 (11:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Oct 2013 18:24:58 +0000 (11:24 -0700)
commit46f37519cf219ce899694b6db7c16f3a86cae8af
tree424cc259122ab57340b9bf615181d55e9749a725tree | snapshot
parentcd4edf7a3476b24f60ef3eac4260b7ff6fbc4d00commit | diff
parent8b3c569a3999a8fd5a819f892525ab5520777c92commit | diff
Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fix from Ralf Baechle:
 "Just one fix.  The stack protector was loading the value of the canary
  instead of its address"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: stack protector: Fix per-task canary switch
John Crispins staging tree