]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eb62d9 194b1ed)
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)
commitb8256c6f6e0e12c062e361979b945289039071cb
tree424cc259122ab57340b9bf615181d55e9749a725tree | snapshot
parent1eb62d9c9c974ffd55f843f4e1e7350290f9493bcommit | diff
parent194b1edac9fd79be70ea30fa8ed1393b7702b1d0commit | diff
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/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
Linux Kernel Source Tree.