diff options
| author |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:04:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-03 15:05:56 -0500 |
| commit | 8aa0a410af8011d557877e558f9ff17c082c6840 (patch) | |
| tree | e347920bcaba78f6af0fecc626c1842f85aeeb83 /include/linux/nfs_idmap.h | |
| parent | NFS: Reduce debugging noise from encode_compound_hdr (diff) | |
| parent | NFSv4: fix server_scope memory leak (diff) | |
| download | linux-dev-8aa0a410af8011d557877e558f9ff17c082c6840.tar.xz linux-dev-8aa0a410af8011d557877e558f9ff17c082c6840.zip | |
Merge commit 'nfs-for-3.3-4' into nfs-for-next
Conflicts:
fs/nfs/nfs4proc.c
Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
Diffstat (limited to 'include/linux/nfs_idmap.h')
0 files changed, 0 insertions, 0 deletions