tree 361f00f4d4ad4c01b6144c52004bee2b948742ad
parent 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6
parent 3d44cc3e01ee1b40317f79ed54324e25c4f848df
author Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> 1229927666 +1100
committer Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> 1229927666 +1100

[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>