Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 00:06:48 +0000 (16:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 00:06:48 +0000 (16:06 -0800)
commita3a71ca9a715776cf3eda605dafdb4a383782c4f
tree5e5ae507d054106e87c2a26d81479955b2de1cfa
parent6f14a668f1a8b715a6e855f4e32705e54a6e86a1
parent8f05228ee7c8f409ae3c6f9c3e13d7ccb9c18360
Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Extend umount wait coverage to full glock lifetime
  GFS2: Wait for unlock completion on umount