git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2afdfa5)
NFSv4: Fix up a merge conflict between migration and container changes
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000 (16:17 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000 (16:17 -0700)
nfs_callback_tcpport is now per-net_namespace.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

No differences found
Pandora Kernel Repository