diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 16:17:31 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 16:17:31 -0700 |
| commit | 9f62387d6e26532bcbfb15606956074192ee526a (patch) | |
| tree | 9102b0babaa7918bcc87f11a8986deee092be908 /security/tomoyo | |
| parent | 2afdfa5a846246de50e1881f71ba5c0aac0b415f (diff) | |
| download | linux-3.10-9f62387d6e26532bcbfb15606956074192ee526a.tar.gz linux-3.10-9f62387d6e26532bcbfb15606956074192ee526a.tar.bz2 linux-3.10-9f62387d6e26532bcbfb15606956074192ee526a.zip | |
NFSv4: Fix up a merge conflict between migration and container changes
nfs_callback_tcpport is now per-net_namespace.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'security/tomoyo')
0 files changed, 0 insertions, 0 deletions