| commit | 99f4065bac7b8c3f829334b4218a5c2e68cbe440 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:55:11 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:55:11 2011 -0700 |
| tree | a7a675dc9cdc386abad4c7ce27ef5a8b59e18507 | |
| parent | f539abece1b7e36fae6add4f9ea29203d40badcb [diff] | |
| parent | e43f055a953721ed1787a039ab5e720755596ea2 [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: use alloc_workqueue function dlm: increase default hash table sizes dlm: record full callback state