| commit | 46f37519cf219ce899694b6db7c16f3a86cae8af | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 11 11:24:58 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 11 11:24:58 2013 -0700 |
| tree | 424cc259122ab57340b9bf615181d55e9749a725 | |
| parent | cd4edf7a3476b24f60ef3eac4260b7ff6fbc4d00 [diff] | |
| parent | 8b3c569a3999a8fd5a819f892525ab5520777c92 [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