| commit | 49d41bae46f15da528ef9848fd7c9d38582aa8e9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 10 14:55:55 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 10 14:55:55 2012 -0800 |
| tree | 76907a9a5066642a32cb238ef8d8367fc612d064 | |
| parent | 7b3480f8b701170c046e1ed362946f5f0d005e13 [diff] | |
| parent | 60f98d1839376d30e13f3e452dce2433fad3060e [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: add recovery callbacks dlm: add node slots and generation dlm: move recovery barrier calls dlm: convert rsb list to rb_tree