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

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

Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)

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

Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)
		1	2
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history