kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-16 18:15:52 +00:00
Code Issues Releases Packages Activity
linux/include/linux/mount.h
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

100 lines
2.9 KiB
Raw Blame History