Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:19:30 +0000 (17:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:19:30 +0000 (17:19 -0800)
commit4cbd55188fe01f22783815cbb6d4f55a0ebf5969
treecbefb228c717bc53542452b44d5349c3665845ee
parentb305956abc3c50c52598bbf39b7a5f4850058ba8
parentb6fa8796b2da0390e9f4115e8789a01004fc1c9b
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: use bastmode in debugfs output
  dlm: Send lockspace name with uevents
  dlm: send reply before bast
  dlm: fix ordering of bast and cast