From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Mon, 29 Dec 2008 05:47:18 +0000 (+1100)
Subject: [XFS] Fix merge failures
X-Git-Tag: v2.6.29-rc1~552^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a8c5395f90f06d128247844b2515c8bf3f2826b;p=pandora-kernel.git

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

0a8c5395f90f06d128247844b2515c8bf3f2826b
Reading git-diff-tree failed