diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 19:42:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 19:42:05 +0100 |
commit | a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35 (patch) | |
tree | 0c5388fdefd00f2f7e381e4f8bd7707e6baeb374 /fs/partitions/atari.h | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
parent | dlm: initialize file_lock struct in GETLK before copying conflicting lock (diff) | |
download | linux-a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35.tar.xz linux-a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35.zip |
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
Diffstat (limited to 'fs/partitions/atari.h')
0 files changed, 0 insertions, 0 deletions