]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'fuse/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:12 +0000 (14:33 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:12 +0000 (14:33 +0200)
1  2 
fs/dcache.c
fs/fuse/cuse.c
fs/fuse/file.c
fs/fuse/fuse_i.h
include/linux/miscdevice.h

diff --cc fs/dcache.c
Simple merge
diff --cc fs/fuse/cuse.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
Simple merge
Simple merge