]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'fuse/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 00:26:57 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 00:26:57 +0000 (11:26 +1100)
1  2 
fs/fuse/dev.c
fs/fuse/inode.c
include/uapi/linux/fuse.h

diff --cc fs/fuse/dev.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
Simple merge