]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7eeae7 8e4daa7)
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)
commit6d7ab39816dabc4165e882b02577f909adbba2c8
treec2cbdca425b745894a23f8cf7d7c91effcd7478ctree | snapshot
parentd7eeae7a5e40048ef5e3705dc9a0e67e73f37d84commit | diff
parent8e4daa7e9a71242e38a0c1f4189bec740b959aaecommit | 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()
fs/dlm/lock.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.