From: Dave Chinner <david@fromorbit.com>
Date: Mon, 19 May 2014 22:57:02 +0000 (+1000)
Subject: Merge branch 'xfs-feature-bit-cleanup' into for-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~55^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b70f14e1ffbb47369b1cc2cdf558c3468ae9e484;p=pandora-kernel.git

Merge branch 'xfs-feature-bit-cleanup' into for-next

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

b70f14e1ffbb47369b1cc2cdf558c3468ae9e484
Reading git-diff-tree failed