Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 13 Apr 2015 01:40:16 +0000 (11:40 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 13 Apr 2015 01:40:16 +0000 (11:40 +1000)
commit6a63ef064b2444883ce8b68b0779d0c739d27204
tree03414baf93943556fc492e041a389b1c9a671b6a
parenta448f8f1b744611fb1867ea811170cca2a9a6588
parent21c3ea18819b5f650c75f59a0457415bc05d2b17
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next

Conflicts:
fs/xfs/xfs_iops.c
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_file.c
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iops.c
fs/xfs/xfs_pnfs.c
fs/xfs/xfs_super.c