tree d7e5cb727569f171795a3c3044d0001ea61ce0bd
parent bc947631d1d532c758f8fcbdeb1f7fc2f4c863f8
parent 1003f06953472ecc34f12d9867670f475a8c1af6
author Linus Torvalds <torvalds@woody.osdl.org> 1166688789 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166688789 -0800

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