tree e53318e43657531399a8d6c721760015b26aa152
parent 94b1984ab9ab61cc6047c07e074d766485299a9c
parent 66ad863b410efb7f537719006f9ac52400c1a5c5
author Linus Torvalds <torvalds@linux-foundation.org> 1326479619 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326479619 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Fix nlink setting on inode creation
  GFS2: fail mount if journal recovery fails
  GFS2: let spectator mount do read only recovery
  GFS2: Fix a use-after-free that coverity spotted
  GFS2: dlm based recovery coordination