projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eedcdef bb50c80)
Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Feb 2008 17:19:47 +0000 (09:19 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Feb 2008 17:19:47 +0000 (09:19 -0800)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.