Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Aug 2008 22:16:10 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Aug 2008 22:16:10 +0000 (15:16 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: rename structs
  dlm: add missing kfrees


Trivial merge