]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'fuse/for-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 10:56:48 +0000 (11:56 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 10:56:48 +0000 (11:56 +0100)
1  2 
fs/fuse/cuse.c
fs/fuse/file.c
fs/fuse/fuse_i.h
include/linux/miscdevice.h

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