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: omap-for-v4.1/fixes-rc1~44^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d41bb03444147305e955cdd53753f0493e4d9e28;p=pandora-kernel.git

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

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

d41bb03444147305e955cdd53753f0493e4d9e28
Reading git-diff-tree failed