tree dc44d88bc66d3e7ec4d1c9180d6d4289fe7c5901
parent e13cf63f2bbd38721af557f0205da994ea068427
parent c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
author Linus Torvalds <torvalds@linux-foundation.org> 1292353745 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292353745 -0800

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