projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc597bc 20d5a39)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:42:05 +0000 (10:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:42:05 +0000 (10:42 -0800)
commita90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35
tree0c5388fdefd00f2f7e381e4f8bd7707e6baeb374tree | snapshot
parentcc597bc3d31468596af6b8ad2b1d1b593e308957commit | diff
parent20d5a39929232a715f29e6cb7e3f0d0c790f41ebcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/dlm

* '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
Domain: System / Uncategorized;