From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 21 Dec 2006 08:13:09 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v2.6.20-rc2~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba6d8b1eba88665d12edd53385d3e26fce5613a3;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] Fix Kconfig
  [DLM] fix compile warning
---

ba6d8b1eba88665d12edd53385d3e26fce5613a3