| commit | df3256f9ab7ae2127144de5ba2abca332278a42d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 15:04:00 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 15:04:00 2011 -0700 |
| tree | c2cbdca425b745894a23f8cf7d7c91effcd7478c | |
| parent | b0ca118dbacbc6c35e15f216e25e95cca7aedf5b [diff] | |
| parent | 901025d2f3194b4868980c8ba80df4cc0aa1282c [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: make plock operation killable dlm: remove shared message stub for recovery dlm: delayed reply message warning dlm: Remove superfluous call to recalc_sigpending()