From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 15:46:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.38-rc1~447
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a;p=thirdparty%2Fkernel%2Flinux.git

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: sanitize work_start() in lowcomms.c
  dlm: reduce cond_resched during send
  dlm: use TCP_NODELAY
  dlm: Use cmwq for send and receive workqueues
  dlm: Handle application limited situations properly.
---

f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a