Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2008 19:56:05 +0000 (11:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2008 19:56:05 +0000 (11:56 -0800)
commit7b423653964b22e6ca1a1ffd84816d619d6a3976
treea005620261a8830c86261733d0f1198d2303335b
parent2d1595ad8766c9cbab81d259168c00261d382ac5
parent278afcbf4fe964230eba67f8fb8235e8b7e63ffb
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 shutdown cleanup