From: Linus Torvalds Date: Wed, 22 Jul 2009 16:47:49 +0000 (-0700) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: v2.6.31-rc4~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12e8ffe35eaca1411afc1f3124478f8e2b65eedc;p=pandora-kernel.git 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 --- 12e8ffe35eaca1411afc1f3124478f8e2b65eedc Reading git-diff-tree failed