tree d03b71e1b87b60d1a9dfbade34156e930f1be1bd
parent 92ae03f2ef99fbc23bfa9080d6b58f25227bd7ef
parent ca9248d8337d525c2d2b26a1d8314478d15707fb
author Linus Torvalds <torvalds@linux-foundation.org> 1334167485 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334167485 -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: 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