| commit | a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 10:42:05 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 10:42:05 2009 -0800 |
| tree | 0c5388fdefd00f2f7e381e4f8bd7707e6baeb374 | |
| parent | cc597bc3d31468596af6b8ad2b1d1b593e308957 [diff] | |
| parent | 20d5a39929232a715f29e6cb7e3f0d0c790f41eb [diff] |
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: initialize file_lock struct in GETLK before copying conflicting lock dlm: fix plock notify callback to lockd