From: Dave Chinner <david@fromorbit.com>
Date: Wed, 14 May 2014 23:39:28 +0000 (+1000)
Subject: Merge branch 'xfs-attr-cleanup' into for-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~55^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d6dcc6d7e95cc83046b2f97e179e6bbb7921245;p=pandora-kernel.git

Merge branch 'xfs-attr-cleanup' into for-next

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

2d6dcc6d7e95cc83046b2f97e179e6bbb7921245
Reading git-diff-tree failed