Merge branch 'xfs-rename-whiteout' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 03:29:13 +0000 (14:29 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 03:29:13 +0000 (14:29 +1100)
commitd41bb03444147305e955cdd53753f0493e4d9e28
tree37535eb32e725933b0c24df5c52c123b187fa910
parent88e8fda99a4c99a1a6482510655dbd88cccd221b
parent7dcf5c3e4527cfa2807567b00387cf2ed5e07f00
Merge branch 'xfs-rename-whiteout' into for-next

Conflicts:
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_iops.c