From: Dave Chinner <david@fromorbit.com>
Date: Wed, 25 Mar 2015 03:29:13 +0000 (+1100)
Subject: Merge branch 'xfs-rename-whiteout' into for-next
X-Git-Tag: firefly_0821_release~176^2~1877^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d41bb03444147305e955cdd53753f0493e4d9e28;hp=d41bb03444147305e955cdd53753f0493e4d9e28;p=firefly-linux-kernel-4.4.55.git

Merge branch 'xfs-rename-whiteout' into for-next

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