]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d9d4eb 3d44cc3)
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 22 Dec 2008 06:34:26 +0000 (17:34 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 22 Dec 2008 06:34:26 +0000 (17:34 +1100)
commit27a0464a6cb837d3a90b6e69365dfc01cb0dff2f
tree361f00f4d4ad4c01b6144c52004bee2b948742adtree | snapshot
parent4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6commit | diff
parent3d44cc3e01ee1b40317f79ed54324e25c4f848dfcommit | diff
[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>
include/linux/fs.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.