]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f71960e 1834591)
[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)
commit53b083d32f4d03f71a98eda94af6337b04a32425
treed95382dcdfa303b99d480c01763d6cb6767fdacatree | snapshot
parentf71960e675e52123244a6fe3d023f7c3336037dbcommit | diff
parent183459115faa2a47f05e4aabb20d0c9694771c51commit | 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
Linux Kernel Source Tree.