Merge commit 'v3.15' into next

This commit is contained in:
James Morris
2014-06-24 18:46:07 +10:00
10774 changed files with 616544 additions and 255982 deletions

View File

@@ -3320,6 +3320,9 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd,
case F_GETLK:
case F_SETLK:
case F_SETLKW:
case F_OFD_GETLK:
case F_OFD_SETLK:
case F_OFD_SETLKW:
#if BITS_PER_LONG == 32
case F_GETLK64:
case F_SETLK64: