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)
Conflicts:
fs/xfs/xfs_inode.c

1  2 
fs/xfs/xfs_inode.c
fs/xfs/xfs_iops.c

Simple merge
Simple merge