From: Linus Torvalds Date: Thu, 30 Oct 2008 19:51:42 +0000 (-0700) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: v2.6.28-rc3~38 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b2d3d94ec878c3529153061cd8cceb876e01a3e;p=linux-2.6-omap-h63xx.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: SUNRPC: Fix potential race in put_rpccred() SUNRPC: Fix rpcauth_prune_expired NFS: Convert nfs_attr_generation_counter into an atomic_long SUNRPC: Respond promptly to server TCP resets --- 1b2d3d94ec878c3529153061cd8cceb876e01a3e