linux-stable/fs/fuse
Jens Axboe 4c63f5646e Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
	block/blk-core.c
	block/blk-flush.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	fs/nilfs2/btnode.c
	fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
2011-03-10 08:58:35 +01:00
..
Kconfig fs/Kconfig: move fuse out 2009-01-22 13:15:55 +03:00
Makefile CUSE: implement CUSE - Character device in Userspace 2009-06-09 11:24:11 +02:00
control.c convert get_sb_single() users 2010-10-29 04:16:28 -04:00
cuse.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
dev.c fuse: allow batching of FORGET requests 2010-12-07 20:16:56 +01:00
dir.c fuse: fix truncate after open 2011-02-25 14:44:58 +01:00
file.c fuse: fix hang of single threaded fuseblk filesystem 2011-02-25 14:44:58 +01:00
fuse_i.h fuse: fix hang of single threaded fuseblk filesystem 2011-02-25 14:44:58 +01:00
inode.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00