From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Oct 2008 18:13:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.28-rc1~728
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=13dd7f876dffb44088c5435c3df1986e33cff960;p=linux-2.6-omap-h63xx.git

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
---

13dd7f876dffb44088c5435c3df1986e33cff960