tree 421fa29aedff988e392f92780637553e275d37a0
parent 70ac4385a13f78bc478f26d317511893741b05bd
parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18
author Trond Myklebust <Trond.Myklebust@netapp.com> 1151152901 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1151168873 -0400

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'