From: Dave Chinner <david@fromorbit.com>
Date: Wed, 3 Dec 2014 22:46:17 +0000 (+1100)
Subject: Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~115^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6044e4386cd51dece882ea42352cdaaab0f24cad;p=pandora-kernel.git

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

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

6044e4386cd51dece882ea42352cdaaab0f24cad
Reading git-diff-tree failed