projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0a8c5395f90f06d128247844b2515c8bf3f2826b
treed95382dcdfa303b99d480c01763d6cb6767fdacatree | snapshot
parent25051158bbed127e8672b43396c71c5eb610e5f1commit | diff
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179commit | diff
[XFS] Fix merge failures

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>
fs/xfs/linux-2.6/xfs_cred.h diff1 | diff2 | blob | history
fs/xfs/linux-2.6/xfs_ioctl.c diff1 | diff2 | blob | history
fs/xfs/xfs_inode.h diff1 | diff2 | blob | history
fs/xfs/xfs_vnodeops.h diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
Making Linux better for my computers