From: Dave Chinner <david@fromorbit.com>
Date: Thu, 13 Mar 2014 08:14:43 +0000 (+1100)
Subject: Merge branch 'xfs-O_TMPFILE-support' into for-next
X-Git-Tag: v3.15-rc1~90^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe986f9d88ab8079c91669b7f175081f15491a80;p=pandora-kernel.git

Merge branch 'xfs-O_TMPFILE-support' into for-next

Conflicts:
	fs/xfs/xfs_trans_resv.c
	- fix for XFS_INODE_CLUSTER_SIZE macro removal
---

fe986f9d88ab8079c91669b7f175081f15491a80
Reading git-diff-tree failed