tree 7da7c54ea167f7c6786c2eac7a6aecff97c77322
parent f474af7051212b4efc8267583fad9c4ebf33ccff
parent 62d98c935456ee121b03d6a68aa3091a04085b7e
author J. Bruce Fields <bfields@redhat.com> 1349973600 -0400
committer J. Bruce Fields <bfields@redhat.com> 1349973665 -0400

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.