From: Linus Torvalds Date: Tue, 24 Apr 2012 15:22:25 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=af3a3ab2966112c0d0a44df7eeb1e95fe32d4495;p=~shefty%2Frdma-dev.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes Pull gfs2 fixes from Steven Whitehouse. * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Instruct DLM to avoid queue convert slowdown --- af3a3ab2966112c0d0a44df7eeb1e95fe32d4495