Skip to content
Commit 27a0464a authored by Lachlan McIlroy's avatar Lachlan McIlroy
Browse files

[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: default avatarLachlan McIlroy <lachlan@sgi.com>
parents 4d9d4ebf 3d44cc3e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment