diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 22:48:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 22:48:07 +0100 |
| commit | 805de022b100bcf796860fe88d7db4164066d1c3 (patch) | |
| tree | 79002a4947a0df8d82ea5f75fac8c6d958848877 /fs/jfs/jfs_logmgr.h | |
| parent | RDMA/nes: Fix mis-merge (diff) | |
| parent | dlm: fix length calculation in compat code (diff) | |
| download | linux-805de022b100bcf796860fe88d7db4164066d1c3.tar.xz linux-805de022b100bcf796860fe88d7db4164066d1c3.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: fix length calculation in compat code
dlm: ignore cancel on granted lock
dlm: clear defunct cancel state
dlm: replace idr with hash table for connections
dlm: comment typo fixes
dlm: use ipv6_addr_copy
dlm: Change rwlock which is only used in write mode to a spinlock
Diffstat (limited to 'fs/jfs/jfs_logmgr.h')
0 files changed, 0 insertions, 0 deletions