tree 8c706018fef444bc16b33fa8208e78cabf993a1f
parent d9089c296bdd82e6c1b7f82d04c11b5decde75e7
parent 18c60c0a3b16fc7d6a55497a228602ad8509f838
author Linus Torvalds <torvalds@linux-foundation.org> 1217263560 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217263560 -0700

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