Skip to content
Commit 8626e4a4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c
parents a8d8f02c 9249e17f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment