Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Mar 2009 21:48:07 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Mar 2009 21:48:07 +0000 (14:48 -0700)
commit805de022b100bcf796860fe88d7db4164066d1c3
tree79002a4947a0df8d82ea5f75fac8c6d958848877
parent7c757eb9f804782fb39d0ae2c1a88ffb9309138e
parent1fecb1c4b62881e3689ba2dcf93072ae301b597c
Merge branch 'for-linus' of git://git./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