From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jul 2008 16:46:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.27-rc1~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3988ba0708e98b4bafc9034aa476775520bee708;p=linux-2.6

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: fix uninitialized variable for search_rsb_list callers
  dlm: release socket on error
  dlm: fix basts for granted CW waiting PR/CW
  dlm: check for null in device_write
---

3988ba0708e98b4bafc9034aa476775520bee708