Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jul 2009 16:47:49 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jul 2009 16:47:49 +0000 (09:47 -0700)
commit12e8ffe35eaca1411afc1f3124478f8e2b65eedc
treeedf463e4744c30fa223f76f30686a49d233d0c9e
parent0d517fb1f3b297fa202c69c94af11ac60b12028e
parentd953126a28f97ec965d23c69fd5795854c048f30
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFSv4: Fix a problem whereby a buggy server can oops the kernel
  NFSv4: Fix an NFSv4 mount regression
  NFSv4: Fix an Oops in nfs4_free_lock_state