From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Jan 2009 23:54:27 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.29-rc2~110
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c69e8839c230c60d3c5f62c8f88bd23d8d6519ee;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

c69e8839c230c60d3c5f62c8f88bd23d8d6519ee