Merge remote-tracking branch 'ext4/dev'

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

Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)

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

Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/namei.c
Simple merge
diff --cc include/linux/ext3_fs.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)
		1	2
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ext3_fs.h	patch \|	diff1 \|	diff2 \|	blob \| history