]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0529a4a861f6c1babe7941ae8200b87006b1162c
treec2cbdca425b745894a23f8cf7d7c91effcd7478c
parenta0abc88fc515227ccf14b772bb71e4f9e8030a81
parent8e4daa7e9a71242e38a0c1f4189bec740b959aae
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