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)
commit1a5d0dd76b1eff1dc65417655fef9b9aea682ed0
tree6e63eae4b8924331882c753c4781f4f1012f2a81
parentfb952af46586ab123ac006248a7196afcf3323a8
parent616fb38fa7a9599293e05ae1fa9acfaf73922434
Merge remote-tracking branch 'file-locks/linux-next'
fs/cifs/file.c
fs/gfs2/file.c
fs/locks.c
fs/nfs/nfs4proc.c
include/linux/fs.h