| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 | [log] [tgz] |
|---|---|---|
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | Sat Jun 24 08:41:41 2006 -0400 |
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | Sat Jun 24 13:07:53 2006 -0400 |
| tree | 421fa29aedff988e392f92780637553e275d37a0 | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd [diff] | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 [diff] |
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'