Merge remote-tracking branch 'file-locks/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:21:53 +0000 (11:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:21:53 +0000 (11:21 +1100)
1  2 
fs/cifs/file.c
fs/gfs2/file.c
fs/locks.c
fs/nfs/nfs4proc.c
include/linux/fs.h

diff --cc fs/cifs/file.c
Simple merge
diff --cc fs/gfs2/file.c
Simple merge
diff --cc fs/locks.c
Simple merge
Simple merge
Simple merge