From: Dave Chinner <david@fromorbit.com>
Date: Wed, 21 Jan 2015 22:20:53 +0000 (+1100)
Subject: Merge branch 'xfs-sb-logging-rework' into for-next
X-Git-Tag: v4.0-rc1~140^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=465e2def7cb45864da1f82afb973a6acd1046ed8;p=karo-tx-linux.git

Merge branch 'xfs-sb-logging-rework' into for-next

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

465e2def7cb45864da1f82afb973a6acd1046ed8