| commit | 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 26 17:19:30 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 26 17:19:30 2010 -0800 |
| tree | cbefb228c717bc53542452b44d5349c3665845ee | |
| parent | b305956abc3c50c52598bbf39b7a5f4850058ba8 [diff] | |
| parent | b6fa8796b2da0390e9f4115e8789a01004fc1c9b [diff] |
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