From: Linus Torvalds Date: Tue, 14 Dec 2010 19:09:05 +0000 (-0800) Subject: Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux X-Git-Tag: firefly_0821_release~7613^2~3263 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5111711d3ed8f4f1012cac3ec3f2b463b549fbfd;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux * 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: nfsd: Fix possible BUG_ON firing in set_change_info sunrpc: prevent use-after-free on clearing XPT_BUSY --- 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd