summaryrefslogtreecommitdiff
path: root/include/linux/nbd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-11 18:24:58 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-11 18:24:58 (GMT)
commit46f37519cf219ce899694b6db7c16f3a86cae8af (patch)
tree424cc259122ab57340b9bf615181d55e9749a725 /include/linux/nbd.h
parentcd4edf7a3476b24f60ef3eac4260b7ff6fbc4d00 (diff)
parent8b3c569a3999a8fd5a819f892525ab5520777c92 (diff)
downloadlinux-fsl-qoriq-46f37519cf219ce899694b6db7c16f3a86cae8af.tar.xz
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
Diffstat (limited to 'include/linux/nbd.h')
0 files changed, 0 insertions, 0 deletions