| commit | 805de022b100bcf796860fe88d7db4164066d1c3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 27 14:48:07 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 27 14:48:07 2009 -0700 |
| tree | 79002a4947a0df8d82ea5f75fac8c6d958848877 | |
| parent | 7c757eb9f804782fb39d0ae2c1a88ffb9309138e [diff] | |
| parent | 1fecb1c4b62881e3689ba2dcf93072ae301b597c [diff] |
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