Merge remote-tracking branch 'fuse/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)
		1	2
fs/fuse/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/fuse/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history