Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Feb 2012 17:17:31 +0000 (09:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Feb 2012 17:17:31 +0000 (09:17 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Read resource groups on mount
  GFS2: Ensure rindex is uptodate for fallocate
  GFS2: Read in rindex if necessary during unlink
  GFS2: Fix race between lru_list and glock ref count


Trivial merge