Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 11 Jan 2016 20:04:30 +0000 (07:04 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 11 Jan 2016 20:04:30 +0000 (07:04 +1100)
commitdde7f55bd000696acc38296c21241971e1840142
tree79fd17020de1ea6921107ad3dbabf5eb33a88838
parent4922be51ef1a95ca6a38694cf0cde5dd0308a24e
parent7d6a13f023567d573ac362502bb702eda716e654
Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next
fs/xfs/xfs_iomap.c
fs/xfs/xfs_log_recover.c