diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 22:44:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 22:44:23 +0200 |
| commit | 03b883840c630c7b571690577809754739ac773f (patch) | |
| tree | aeec0581accf5e19360205e21dd25a220b4a0e54 /drivers/uio | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | dlm: linux/{dlm,dlm_device}.h: cleanup for userspace (diff) | |
| download | linux-03b883840c630c7b571690577809754739ac773f.tar.xz linux-03b883840c630c7b571690577809754739ac773f.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: 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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions