| commit | 03b883840c630c7b571690577809754739ac773f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 22 13:44:23 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 22 13:44:23 2008 -0700 |
| tree | aeec0581accf5e19360205e21dd25a220b4a0e54 | |
| parent | 0d07a15bdb5a4ea6271b6e874d307c48151ef546 [diff] | |
| parent | c1c76743e98346eb052b707f0e054377a09441d1 [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: linux/{dlm,dlm_device}.h: cleanup for userspace
dlm: common max length definitions
dlm: move plock code from gfs2
dlm: recover nodes that are removed and re-added
dlm: save master info after failed no-queue request
dlm: make dlm_print_rsb() static
dlm: match signedness between dlm_config_info and cluster_set