projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc597bc
20d5a39
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:42:05 +0000
(10:42 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:42:05 +0000
(10:42 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: initialize file_lock struct in GETLK before copying conflicting lock
dlm: fix plock notify callback to lockd
Trivial merge