summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:36:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:36:38 -0700
commit64b4aaf0250c37e86aa12ecaab7e0108ecd88382 (patch)
tree08ab45a0abbf36fc0f10e295c3047f16342d2f38 /fs
parent84e4526f88e5904509f0226dfabdbbc9d99c7db3 (diff)
parent6ea062475a9a2ea6e1394487fa0e51b3459957d1 (diff)
downloadlinux-64b4aaf0250c37e86aa12ecaab7e0108ecd88382.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fix from James Morris: "Smack casting fix" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Smack: IPv6 casting error fix for 3.11
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions