From: Dave Chinner <david@fromorbit.com>
Date: Wed, 25 Mar 2015 04:12:30 +0000 (+1100)
Subject: Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~44^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b93681f593577df6fcb9af61947beaace071b74;p=pandora-kernel.git

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

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

2b93681f593577df6fcb9af61947beaace071b74
Reading git-diff-tree failed