aboutsummaryrefslogtreecommitdiff
path: root/drivers/virtio
diff options
context:
space:
mode:
authorLinus Torvalds2013-08-03 11:15:03 -0700
committerLinus Torvalds2013-08-03 11:15:03 -0700
commit83aaf3b39c4f26d71a58f84924b6c6f9b1070d54 (patch)
tree9a8d254a70cff9591b5371563579e7c3d86d2550 /drivers/virtio
parent32c6e2587f3fe2658b6c67b6d2a0893dd359c13a (diff)
parent7193bd17ea92c4c89016c304362c9be93ce50050 (diff)
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields: "Most of this is due to a screwup on my part -- some gss-proxy crashes got fixed before the merge window but somehow never made it out of a temporary git repo on my laptop...." * 'for-3.11' of git://linux-nfs.org/~bfields/linux: svcrpc: set cr_gss_mech from gss-proxy as well as legacy upcall svcrpc: fix kfree oops in gss-proxy code svcrpc: fix gss-proxy xdr decoding oops svcrpc: fix gss_rpc_upcall create error NFSD/sunrpc: avoid deadlock on TCP connection due to memory pressure.
Diffstat (limited to 'drivers/virtio')
0 files changed, 0 insertions, 0 deletions