]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 70ac438 d384ea6)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 24 Jun 2006 12:41:41 +0000 (08:41 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 24 Jun 2006 17:07:53 +0000 (13:07 -0400)
commit816724e65c72a90a44fbad0ef0b59b186c85fa90
tree421fa29aedff988e392f92780637553e275d37a0tree | snapshot
parent70ac4385a13f78bc478f26d317511893741b05bdcommit | diff
parentd384ea691fe4ea8c2dd5b9b8d9042eb181776f18commit | 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'
20 files changed:
drivers/usb/core/inode.c diff1 | diff2 | blob | history
fs/9p/vfs_super.c diff1 | diff2 | blob | history
fs/afs/mntpt.c diff1 | diff2 | blob | history
fs/afs/super.c diff1 | diff2 | blob | history
fs/binfmt_misc.c diff1 | diff2 | blob | history
fs/cifs/cifsfs.c diff1 | diff2 | blob | history
fs/configfs/mount.c diff1 | diff2 | blob | history
fs/debugfs/inode.c diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
fs/libfs.c diff1 | diff2 | blob | history
fs/namespace.c diff1 | diff2 | blob | history
fs/nfs/file.c diff1 | diff2 | blob | history
fs/nfs/nfs2xdr.c diff1 | diff2 | blob | history
fs/nfs/super.c diff1 | | blob | history
fs/super.c diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
include/linux/mount.h diff1 | diff2 | blob | history
mm/shmem.c diff1 | diff2 | blob | history
net/sunrpc/rpc_pipe.c diff1 | diff2 | blob | history
security/inode.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.