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)
commitc69e8839c230c60d3c5f62c8f88bd23d8d6519ee
tree8d4a28c589b8df9020561e19766bb9ba9edfebbf
parent3e55f1a292583b11ff85952eec77d65a459da2dd
parentc7be761a8163d2f1ac0b606c21e4316b7abc5af7
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: change rsbtbl rwlock to spinlock
  dlm: fix seq_file usage in debugfs lock dump