summaryrefslogtreecommitdiff
path: root/fs/nfs/callback.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-10-11 20:40:00 +0400
committerJ. Bruce Fields <bfields@redhat.com>2012-10-11 20:41:05 +0400
commita9ca4043d074509b9d15003fbcb068d3cdae85a4 (patch)
tree7da7c54ea167f7c6786c2eac7a6aecff97c77322 /fs/nfs/callback.c
parentf474af7051212b4efc8267583fad9c4ebf33ccff (diff)
parent62d98c935456ee121b03d6a68aa3091a04085b7e (diff)
downloadlinux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.tar.xz
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 'fs/nfs/callback.c')
0 files changed, 0 insertions, 0 deletions