Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
commitaf3a3ab2966112c0d0a44df7eeb1e95fe32d4495
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Apr 2012 15:22:25 +0000 (24 08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Apr 2012 15:22:25 +0000 (24 08:22 -0700)
tree82b8d00bdbb6d88eb5ba353de8a3fe2e2ad55269
parent423b40e194a8ad8f7cc15cc38bd18633891a04ad
parent4c569a72c30dfee9b5133284aba67e3aa0c9505d
Merge git://git./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