summaryrefslogtreecommitdiff
path: root/fs/locks.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 09:44:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 09:44:20 -0700
commitdf9d030c1324e9b75a425903f9f66bbc960bf713 (patch)
treef248668ab9451e0087f1de36122f8c6e512fcc39 /fs/locks.c
parente1d76719ea3f3f755d597cef9c2087bdda5fea43 (diff)
parent82b88bb24e28dd4fb4bec30e75412f41326130f0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: skip file_name_trans_write() when policy downgraded. selinux: fix case of names with whitespace/multibytes on /selinux/create
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions