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

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

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

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

Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)
diff --cc fs/ext4/extents.c
Simple merge
diff --cc fs/nfsd/nfs4proc.c
Simple merge
diff --cc fs/nfsd/nfs4state.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)
		1	2
fs/ext4/extents.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4proc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4state.c	patch \|	diff1 \|	diff2 \|	blob \| history