diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-04-26 11:37:29 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-26 11:37:43 -0400 |
| commit | c85b03ab200f6d2c2f80588d96d03c1f8fcaedc3 (patch) | |
| tree | 34f4f3200ef5db6ca93360879fffda050c04e1ca /include/linux/if_pppox.h | |
| parent | bf8d909705e9d9bac31d9b8eac6734d2b51332a7 (diff) | |
| parent | fd068b200fb86e8fa52368e6f6088d2ab297a5d7 (diff) | |
Merge Trond's nfs-for-next
Merging Trond's nfs-for-next branch, mainly to get
b7993cebb841b0da7a33e9d5ce301a9fd3209165 "SUNRPC: Allow rpc_create() to
request that TCP slots be unlimited", which a small piece of the
gss-proxy work depends on.
Diffstat (limited to 'include/linux/if_pppox.h')
0 files changed, 0 insertions, 0 deletions