tree ea43bc34715d854c599743bf226437339bed1beb
parent 122ce878dc189860a380539bde19498bf93443a7
parent 720e7749279bde0d08684b1bb4e7a2eedeec6394
author Linus Torvalds <torvalds@linux-foundation.org> 1268519933 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1268519933 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Skip check for mandatory locks when unlocking
  GFS2: Allow the number of committed revokes to temporarily be negative
  GFS2: do not select QUOTA