From: Dave Chinner <david@fromorbit.com>
Date: Mon, 23 Feb 2015 23:27:28 +0000 (+1100)
Subject: Merge branch 'xfs-generic-sb-counters' into for-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~44^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4225441a1eec45241efe529d23403d8ca3d1d71b;p=pandora-kernel.git

Merge branch 'xfs-generic-sb-counters' into for-next

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

4225441a1eec45241efe529d23403d8ca3d1d71b
Reading git-diff-tree failed