From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Oct 2013 18:24:58 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.0~3128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46f37519cf219ce899694b6db7c16f3a86cae8af;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

46f37519cf219ce899694b6db7c16f3a86cae8af