Yocto Project Linux Firmware / linux-wandboard / 816724e65c7

Commits

Trond Myklebust committed 816724e65c7M24 Jun 2006

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'

Showing diff to70ac4385a13