Merge remote-tracking branch 'ext4/dev'

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

Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)

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

Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/namei.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)
		1	2
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history