diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-10-11 18:40:00 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-10-11 18:41:05 +0200 |
| commit | a9ca4043d074509b9d15003fbcb068d3cdae85a4 (patch) | |
| tree | 7da7c54ea167f7c6786c2eac7a6aecff97c77322 /net/ipv4/esp4.c | |
| parent | nfs: disintegrate UAPI for nfs (diff) | |
| parent | NFS4: avoid underflow when converting error to pointer. (diff) | |
| download | linux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.tar.xz linux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.zip | |
Merge Trond's bugfixes
Merge branch 'bugfixes' of git://linux-nfs.org/~trondmy/nfs-2.6 into
for-3.7-incoming. Mainly needed for Bryan's "SUNRPC: Set alloc_slot for
backchannel tcp ops", without which the 4.1 server oopses.
Diffstat (limited to 'net/ipv4/esp4.c')
0 files changed, 0 insertions, 0 deletions