From: Dave Chinner <david@fromorbit.com>
Date: Thu, 4 Jun 2015 03:55:48 +0000 (+1000)
Subject: Merge branch 'xfs-commit-cleanup' into for-next
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~97^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea79766168b64766d6c9fcdaa9fab83a6cfebcf;p=pandora-kernel.git

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

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

4ea79766168b64766d6c9fcdaa9fab83a6cfebcf
Reading git-diff-tree failed