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
..
2006-03-20 13:44:23 -05:00
2006-04-19 12:43:47 -04:00
2006-03-20 22:35:41 -08:00
2005-04-16 15:20:36 -07:00