]> 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>
Sat, 23 Oct 2010 00:33:16 +0000 (17:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:33:16 +0000 (17:33 -0700)
commitb144fcf9356261de31acecd2fe3326c6548265f5
tree2bfc3434e4c35d4eb91e5c3c02714c1fd2b83afb
parent50f7c31dde3fdcc4481ea4c67aee13ff873d0ca0
parent28a23350c95ba55dae7e30f4835861149d591679
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: Fix dlm lock status block comment in dlm.h
  dlm: Don't send callback to node making lock request when "try 1cb" fails