]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a05da5 c3a42ec)
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)
commit3ac542babba06cf7d43c47e9694b74b19479fd3c
tree424cc259122ab57340b9bf615181d55e9749a725tree | snapshot
parent2a05da52910aa7194a5282c872f8393bb1891234commit | diff
parentc3a42ec387afece06d5ed7b115facccef21577dbcommit | 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.