Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 16:19:10 +0000 (09:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 16:19:10 +0000 (09:19 -0700)
commit5ce00289875a853280985aee671258795b77e089
treec88e4ec62cad3e83dadb49dddbcde81a2808a3c1
parent2511817cf9b1cf2506f47e20bb128e2da231c150
parent1329e3f2c898cfabb6ed236d3fb8c1725197af53
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: use kernel_sendpage
  dlm: fix connection close handling
  dlm: fix double-release of socket in error exit path