summaryrefslogtreecommitdiff
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-07-14 00:30:40 +1000
committerJames Morris <jmorris@namei.org>2009-07-14 00:30:40 +1000
commit7d45ecafb6792ca68da9517969d37d910601845f (patch)
treea98b1074e5577e66a97963745f975404d0aac266 /fs/locks.c
parentbe940d6279c30a2d7c4e8d1d5435f957f594d66d (diff)
parent7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff)
downloadlinux-3.10-7d45ecafb6792ca68da9517969d37d910601845f.tar.gz
linux-3.10-7d45ecafb6792ca68da9517969d37d910601845f.tar.bz2
linux-3.10-7d45ecafb6792ca68da9517969d37d910601845f.zip
Merge branch 'master' into next
Conflicts: include/linux/personality.h Use Linus' version. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions