projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
John Crispins staging tree