diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 09:19:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 09:19:47 -0800 |
| commit | 0c0d61ca93d111c521182c0909e478fa709e05c6 (patch) | |
| tree | be690362142ec79a673f85d7b2b7323102fab6f8 /drivers/video | |
| parent | eedcdefb1ad75de9cc0889b247524be64cc244ef (diff) | |
| parent | bb50c8012cbd85b8e105584b32e4d5a2d335dcef (diff) | |
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
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions