Merge branch 'xfs-misc-fixes-for-3.18-2' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 23 Sep 2014 12:55:51 +0000 (22:55 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 23 Sep 2014 12:55:51 +0000 (22:55 +1000)
1  2 
fs/xfs/xfs_bmap_util.c

Simple merge