git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2505115 3c92ec8)
[XFS] Fix merge failures
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 29 Dec 2008 05:47:18 +0000 (16:47 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 29 Dec 2008 05:47:18 +0000 (16:47 +1100)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h

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

Trivial merge
Pandora Kernel Repository