Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Jan 2009 23:54:27 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Jan 2009 23:54:27 +0000 (15:54 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: change rsbtbl rwlock to spinlock
  dlm: fix seq_file usage in debugfs lock dump


Trivial merge