Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 21 Dec 2006 08:13:09 +0000 (00:13 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 21 Dec 2006 08:13:09 +0000 (00:13 -0800)
commitba6d8b1eba88665d12edd53385d3e26fce5613a3
treed7e5cb727569f171795a3c3044d0001ea61ce0bd
parentbc947631d1d532c758f8fcbdeb1f7fc2f4c863f8
parent1003f06953472ecc34f12d9867670f475a8c1af6
Merge /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