]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'fscache/fscache'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 09:45:01 +0000 (10:45 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 09:45:01 +0000 (10:45 +0100)
1  2 
fs/ceph/cache.c
fs/cifs/fscache.c
fs/nfs/dir.c
fs/nfs/nfs4file.c
include/linux/fs.h
include/linux/nfs_fs.h

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