]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'file-locks/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:32:44 +0000 (10:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:32:44 +0000 (10:32 +1100)
commitd55d7a459152fa04e528697431f47413ef0685eb
tree8016489fd2862182684c11530811553b37466f15
parentcbbff519179e82ca982bbd2ae23aec98c5f3054d
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