projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0ca118 901025d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <[email protected]>
Tue, 24 May 2011 22:04:00 +0000 (15:04 -0700)
committerLinus Torvalds <[email protected]>
Tue, 24 May 2011 22:04:00 +0000 (15:04 -0700)
* '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()

1  2 
fs/dlm/lock.c patch | diff1 | diff2 | blob | history

diff --cc fs/dlm/lock.c
Simple merge
John Crispins staging tree