tree d95382dcdfa303b99d480c01763d6cb6767fdaca
parent 25051158bbed127e8672b43396c71c5eb610e5f1
parent 3c92ec8ae91ecf59d88c798301833d7cf83f2179
author Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> 1230529638 +1100
committer Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> 1230529638 +1100

[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>