Trond Myklebust 816724e65c 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'

2006-06-24 13:07:53 -04:00

10 KiB

Raw Blame History

View Raw