git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8d8f02 9249e17)
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 16 Jul 2012 16:01:42 +0000 (12:01 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 16 Jul 2012 16:01:42 +0000 (12:01 -0400)
Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
fs/nfs/nfs4proc.c


Trivial merge
Pandora Kernel Repository