tree 82b8d00bdbb6d88eb5ba353de8a3fe2e2ad55269
parent 423b40e194a8ad8f7cc15cc38bd18633891a04ad
parent 4c569a72c30dfee9b5133284aba67e3aa0c9505d
author Linus Torvalds <torvalds@linux-foundation.org> 1335280945 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1335280945 -0700

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