projects / platform / kernel / linux-3.10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0ca118 901025d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 22:04:00 +0000 (15:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 22:04:00 +0000 (15:04 -0700)
commitdf3256f9ab7ae2127144de5ba2abca332278a42d
treec2cbdca425b745894a23f8cf7d7c91effcd7478ctree | snapshot
parentb0ca118dbacbc6c35e15f216e25e95cca7aedf5bcommit | diff
parent901025d2f3194b4868980c8ba80df4cc0aa1282ccommit | diff
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: make plock operation killable
  dlm: remove shared message stub for recovery
  dlm: delayed reply message warning
  dlm: Remove superfluous call to recalc_sigpending()
fs/dlm/lock.c diff1 | diff2 | blob | history
Domain: System / Kernel;