git.cascardo.eti.br Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a8d8f02 9249e17)

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Mon, 16 Jul 2012 16:01:42 +0000 (12:01 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Mon, 16 Jul 2012 16:01:42 +0000 (12:01 -0400)
commit	8626e4a42675ff9903f7d4fbf14d8ebc11b5926c
tree	c631dfe2854cb1382a5d8f5aa11b071762ddf27d	tree \| snapshot
parent	a8d8f02cf0c379693762107afe812b9e52090e39	commit \| diff
parent	9249e17fe094d853d1ef7475dd559a2cc7e23d42	commit \| diff

Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
fs/nfs/nfs4proc.c

fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs3proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_xdr.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.