git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5c26702 5c4672b)

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	295580f2602ccf69e865f72f1412f6dc2b521f4b
tree	c631dfe2854cb1382a5d8f5aa11b071762ddf27d	tree \| snapshot
parent	5c26702953811506abf29207b72523881a3f007e	commit \| diff
parent	5c4672bcb9221029caf586a9560647c3ea121c79	commit \| diff

Merge commit '5c4672bcb9221029caf586a9560647c3ea121c79' 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

Linux Kernel Source Tree.