tree a7a675dc9cdc386abad4c7ce27ef5a8b59e18507
parent f539abece1b7e36fae6add4f9ea29203d40badcb
parent e43f055a953721ed1787a039ab5e720755596ea2
author Linus Torvalds <torvalds@linux-foundation.org> 1300470911 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300470911 -0700

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