Merge branch 'xfs-bug-fixes-for-3.15-2' into for-next

author Dave Chinner <david@fromorbit.com>

Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)

committer Dave Chinner <david@fromorbit.com>

Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)
author Dave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)
committer Dave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)
diff --cc fs/xfs/xfs_aops.c
Simple merge
diff --cc fs/xfs/xfs_ialloc.c
Simple merge
diff --cc fs/xfs/xfs_mount.c
Simple merge
diff --cc fs/xfs/xfs_trans_resv.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)
committer	Dave Chinner <david@fromorbit.com>
	Thu, 13 Mar 2014 08:13:05 +0000 (19:13 +1100)
		1	2
fs/xfs/xfs_aops.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_ialloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trans_resv.c	patch \|	diff1 \|	diff2 \|	blob \| history