From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Apr 2012 18:04:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
X-Git-Tag: Ubuntu-5.0.0-8.9~16332
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1b6150fe82de8a555b0200d20bb5e3752fbe4160;p=mirror_ubuntu-disco-kernel.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: Allow caching of rindex glock
  GFS2: Make sure rindex is uptodate before starting transactions
  GFS2: use depends instead of select in kconfig
  GFS2: put glock reference in error patch of read_rindex_entry
---

1b6150fe82de8a555b0200d20bb5e3752fbe4160