Merge remote-tracking branch 'ext4/dev'

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

Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)

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

Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/jbd2/journal.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 21 Aug 2012 01:10:33 +0000 (11:10 +1000)
		1	2
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/jbd2/journal.c	patch \|	diff1 \|	diff2 \|	blob \| history