Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 01:44:10 +0000 (18:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 01:44:10 +0000 (18:44 -0700)
commitd205df9955feb9c2ae63ac1387804e225ff22605
treeabae84cb6fc082f14072089bb0058b1bbd88c97a
parent24210071e0dd7da1a945a2a1686b93f2b2f3b410
parentf90e5b5b136ede1f0fd15999e95f13124d6b0dbd
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: Processes waiting on inode glock that no processes are holding
fs/gfs2/glock.c