tree 68c6a283b26b89cb2591f3be2f927234243a5d7d
parent d878fe2331219ff8518192b67f66699cb6d164e2
parent a89d63a159b1ba5833be2bef00adf8ad8caac8be
author Linus Torvalds <torvalds@linux-foundation.org> 1247621844 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247621844 -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: free socket in error exit path
  dlm: fix plock use-after-free
  dlm: Fix uninitialised variable warning in lock.c