projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fe3a5a
269cddd
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:33:16 +0000
(17:33 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:33:16 +0000
(17:33 -0700)
* '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
Trivial merge