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