From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 24 Jun 2006 12:41:41 +0000 (-0400)
Subject: Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
X-Git-Tag: v2.6.18-rc1~861^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=816724e65c72a90a44fbad0ef0b59b186c85fa90;p=pandora-kernel.git

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
---

816724e65c72a90a44fbad0ef0b59b186c85fa90
Reading git-diff-tree failed