Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 04:12:30 +0000 (15:12 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 04:12:30 +0000 (15:12 +1100)
commit2b93681f593577df6fcb9af61947beaace071b74
tree1d4826b38a06d3da93de1aaf9f66dda2cd99911d
parentd41bb03444147305e955cdd53753f0493e4d9e28
parent5e9383f97e773e9a5385144ef5561f2ac0ee1349
Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next

Conflicts:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_super.c
fs/xfs/xfs_trace.h