Merge remote-tracking branch 'fscache/fscache'

diff --cc fs/ceph/cache.c
Simple merge

diff --cc fs/cifs/fscache.c
Simple merge

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/nfs/nfs4file.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/nfs_fs.h
Simple merge