From: Linus Torvalds Date: Thu, 3 Jan 2008 19:59:59 +0000 (-0800) Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 X-Git-Tag: v2.6.24-rc7~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c5d63d8f013f232fc6e353d9151b35ec7282d52;p=linux-2.6-omap-h63xx.git Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 * git://git.linux-nfs.org/pub/linux/nfs-2.6: NFSv4: Fix open_to_lock_owner sequenceid allocation... NFSv4: nfs4_open_confirm must not set the open_owner as confirmed on error NFS: add newline to kernel warning message in auth_gss code NFSv4: Fix circular locking dependency in nfs4_kill_renewd NFS: Fix a possible Oops in fs/nfs/super.c --- 2c5d63d8f013f232fc6e353d9151b35ec7282d52