From: Trond Myklebust Date: Mon, 16 Jul 2012 16:01:42 +0000 (-0400) Subject: Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6 X-Git-Tag: v3.6-rc1~38^2~33 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8626e4a42675ff9903f7d4fbf14d8ebc11b5926c;p=pandora-kernel.git Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6 Resolve conflicts with the VFS atomic open and sget changes. Conflicts: fs/nfs/nfs4proc.c --- 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c Reading git-diff-tree failed