Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:55:11 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:55:11 +0000 (10:55 -0700)
commit99f4065bac7b8c3f829334b4218a5c2e68cbe440
treea7a675dc9cdc386abad4c7ce27ef5a8b59e18507
parentf539abece1b7e36fae6add4f9ea29203d40badcb
parente43f055a953721ed1787a039ab5e720755596ea2
Merge branch 'for-linus' of git://git./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