Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 16:59:11 +0000 (08:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 16:59:11 +0000 (08:59 -0800)
commitf02877ce3ca8f87a086e3fc98bb9e022bbec70ec
tree8ea602e020162117bb259be5c17b9cda24fb5176
parent3c512b193a3f8c24045b809db91b03f463f72105
parent24ca9a847791fd53d9b217330b15f3c285827a18
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared