From: Dave Chinner <david@fromorbit.com>
Date: Mon, 13 Apr 2015 01:40:16 +0000 (+1000)
Subject: Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~44^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a63ef064b2444883ce8b68b0779d0c739d27204;p=pandora-kernel.git

Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next

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

6a63ef064b2444883ce8b68b0779d0c739d27204
Reading git-diff-tree failed