From: Alex Elder <aelder@sgi.com>
Date: Tue, 18 Oct 2011 20:00:14 +0000 (+0000)
Subject: xfs: put in missed fix for merge problem
X-Git-Tag: v3.2-rc1~134^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2900b33999e2fc8a8edf0dddaafffec4da25ee10;p=pandora-kernel.git

xfs: put in missed fix for merge problem

I intended to do this as part of fixing part of the conflict with
the merge with Linus' tree, but evidently it didn't get included in
the commit.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

Reading git-diff-tree failed