git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository