diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 16:07:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 16:07:44 -0800 |
| commit | 843c04a0f63c74c6424e4b7d1ab85223b1ecf740 (patch) | |
| tree | c7f6b771ccc47a249b3c607471b3fbd1ad7ab7d2 /drivers/rtc/rtc-proc.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found (diff) | |
| download | linux-dev-843c04a0f63c74c6424e4b7d1ab85223b1ecf740.tar.xz linux-dev-843c04a0f63c74c6424e4b7d1ab85223b1ecf740.zip | |
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
nfsd: fix cred leak on every rpc
nfsd: fix null dereference on error path
nfs: note that CONFIG_SUNRPC_XPRT_RDMA turns on server side support too
update port number in NFS/RDMA documentation
Diffstat (limited to 'drivers/rtc/rtc-proc.c')
0 files changed, 0 insertions, 0 deletions