Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:37:24 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:37:24 +0000 (18:37 -0700)
commit8aa651e23e2835b6d64381ce17447c995040ab30
tree68c6a283b26b89cb2591f3be2f927234243a5d7d
parentd878fe2331219ff8518192b67f66699cb6d164e2
parenta89d63a159b1ba5833be2bef00adf8ad8caac8be
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: free socket in error exit path
  dlm: fix plock use-after-free
  dlm: Fix uninitialised variable warning in lock.c