From: Dave Chinner <david@fromorbit.com>
Date: Mon, 19 May 2014 22:56:00 +0000 (+1000)
Subject: Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~55^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d907a3bb4a77cffebebd17c323e898048301aa3;p=pandora-kernel.git

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

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

0d907a3bb4a77cffebebd17c323e898048301aa3
Reading git-diff-tree failed