diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 02:11:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 02:11:56 +0200 |
| commit | 2ea3f868487dcee0bfd91055f1c42bb172efc507 (patch) | |
| tree | ab8386aba340269f36c402c59ca77234ac1db7a6 /include | |
| parent | epoll: fix size check in epoll_create() (diff) | |
| parent | nfsd: silence lockdep warning (diff) | |
| download | linux-2ea3f868487dcee0bfd91055f1c42bb172efc507.tar.xz linux-2ea3f868487dcee0bfd91055f1c42bb172efc507.zip | |
Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux:
nfsd: silence lockdep warning
lockd: fix list corruption on lockd restart
nfsd4: check for negative dentry before use in nfsv4 readdir
nfsd41: slots are freed with session
svcrdma: clean up error paths.
svcrdma: Fix dma map direction for rdma read targets
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions