From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 11 Feb 2008 17:19:47 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.25-rc2~92
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0c0d61ca93d111c521182c0909e478fa709e05c6;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

* 'for-linus' of git://linux-nfs.org/~bfields/linux:
  SUNPRC: Fix printk format warning
  nfsd: clean up svc_reserve_auth()
  NLM: don't requeue block if it was invalidated while GRANT_MSG was in flight
  NLM: don't reattempt GRANT_MSG when there is already an RPC in flight
  NLM: have server-side RPC clients default to soft RPC tasks
  NLM: set RPC_CLNT_CREATE_NOPING for NLM RPC clients
---

0c0d61ca93d111c521182c0909e478fa709e05c6