Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Oct 2008 18:13:55 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Oct 2008 18:13:55 +0000 (11:13 -0700)
commit13dd7f876dffb44088c5435c3df1986e33cff960
treec9043429452663661dc888e1cbafa87bd2a62f44
parentb0af205afb111e17ac8db64c3b9c4f2c332de92a
parent27eccf46491e1f77f9af9bbe0778122ce6882890
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: 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