Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:09:05 +0000 (11:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 19:09:05 +0000 (11:09 -0800)
commit5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
treedc44d88bc66d3e7ec4d1c9180d6d4289fe7c5901
parente13cf63f2bbd38721af557f0205da994ea068427
parentc1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
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