Merge branch 'xfs-fixes-for-3.15' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 20 Feb 2014 04:16:09 +0000 (15:16 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 20 Feb 2014 04:16:09 +0000 (15:16 +1100)
1  2 
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_sb.c

Simple merge
diff --cc fs/xfs/xfs_sb.c
Simple merge