From: Linus Torvalds Date: Mon, 28 Nov 2011 16:59:11 +0000 (-0800) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f02877ce3ca8f87a086e3fc98bb9e022bbec70ec;p=deliverable%2Flinux.git 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 --- f02877ce3ca8f87a086e3fc98bb9e022bbec70ec