]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 17:11:38 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 17:11:38 +0000 (10:11 -0700)
* 'for-2.6.31' of git://linux-nfs.org/~bfields/linux:
  NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()


Trivial merge