From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Mon, 22 Dec 2008 06:34:26 +0000 (+1100)
Subject: [XFS] Fix merge conflict in fs/xfs/xfs_rename.c
X-Git-Tag: v2.6.29-rc1~552^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a0464a6cb837d3a90b6e69365dfc01cb0dff2f;p=pandora-kernel.git

[XFS] Fix merge conflict in fs/xfs/xfs_rename.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/xfs_rename.c

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
---

27a0464a6cb837d3a90b6e69365dfc01cb0dff2f
Reading git-diff-tree failed