From: Linus Torvalds Date: Fri, 18 Mar 2011 17:55:11 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Tag: v2.6.39-rc1~418 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=99f4065bac7b8c3f829334b4218a5c2e68cbe440 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 --- 99f4065bac7b8c3f829334b4218a5c2e68cbe440