Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2008 16:46:00 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2008 16:46:00 +0000 (09:46 -0700)
commit3988ba0708e98b4bafc9034aa476775520bee708
tree8c706018fef444bc16b33fa8208e78cabf993a1f
parentd9089c296bdd82e6c1b7f82d04c11b5decde75e7
parent18c60c0a3b16fc7d6a55497a228602ad8509f838
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: 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
fs/dlm/user.c