From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 20:16:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v3.1-rc1~323
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6aaf4404ab2efff2f2f3ee4a5bb5379c1c8092b3;p=profile%2Fivi%2Fkernel-x86-ivi.git

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: don't limit active work items
  dlm: use workqueue for callbacks
  dlm: remove deadlock debug print
  dlm: improve rsb searches
  dlm: keep lkbs in idr
  dlm: fix kmalloc args
  dlm: don't do pointless NULL check, use kzalloc and fix order of arguments
  dlm: dump address of unknown node
  dlm: use vmalloc for hash tables
  dlm: show addresses in configfs
---

6aaf4404ab2efff2f2f3ee4a5bb5379c1c8092b3