tree c9043429452663661dc888e1cbafa87bd2a62f44
parent b0af205afb111e17ac8db64c3b9c4f2c332de92a
parent 27eccf46491e1f77f9af9bbe0778122ce6882890
author Linus Torvalds <torvalds@linux-foundation.org> 1223662435 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223662435 -0700

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: choose better identifiers
  dlm: remove bkl
  dlm: fix address compare
  dlm: fix locking of lockspace list in dlm_scand
  dlm: detect available userspace daemon
  dlm: allow multiple lockspace creates