diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:42:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:42:05 -0800 |
| commit | a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35 (patch) | |
| tree | 0c5388fdefd00f2f7e381e4f8bd7707e6baeb374 /crypto/api.c | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6 (diff) | |
| parent | dlm: initialize file_lock struct in GETLK before copying conflicting lock (diff) | |
| download | linux-rng-a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35.tar.xz linux-rng-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 'crypto/api.c')
0 files changed, 0 insertions, 0 deletions