Merge branch 'xfs-misc-fixes-for-3.18-1' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 9 Sep 2014 03:25:31 +0000 (13:25 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 9 Sep 2014 03:25:31 +0000 (13:25 +1000)
1  2 
fs/xfs/xfs_file.c

Simple merge