From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Feb 2010 01:19:30 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.34-rc1~277
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cbd55188fe01f22783815cbb6d4f55a0ebf5969;p=thirdparty%2Fkernel%2Flinux.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: use bastmode in debugfs output
  dlm: Send lockspace name with uevents
  dlm: send reply before bast
  dlm: fix ordering of bast and cast
---

4cbd55188fe01f22783815cbb6d4f55a0ebf5969