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)
commita4241aebe924136d6838fd516da6daa727fcd728
tree5a69b8c8e2ab358ad490150c2bd5b0c53893b5e7
parent41b9d7263ea1e270019c5d04fa0ab15db50b9725
parentab6978c295b074eb2ba4b06fdf206c7ab4f293e5
Merge branch 'xfs-misc-fixes-for-3.18-1' into for-next
fs/xfs/xfs_file.c