From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 00:29:04 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v2.6.38-rc2~27
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b06ae1ead2915860bb49331e0588aab326801f71;p=~emulex%2Finfiniband.git

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: Fix error path in gfs2_lookup_by_inum()
  GFS2: remove iopen glocks from cache on failed deletes
---

b06ae1ead2915860bb49331e0588aab326801f71