From: Dave Chinner <david@fromorbit.com>
Date: Thu, 16 Apr 2015 12:13:18 +0000 (+1000)
Subject: Merge branch 'xfs-dio-extend-fix' into for-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~44^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542c311813d5cb2e6f0dfa9557f41c829b8fb6a0;p=pandora-kernel.git

Merge branch 'xfs-dio-extend-fix' into for-next

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

542c311813d5cb2e6f0dfa9557f41c829b8fb6a0
Reading git-diff-tree failed