From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Jan 2012 23:36:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.3-rc2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aaad641eadfd3e74b0fbb68fcf539b9cef0415d0;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

Quoth Ben Myers:
 "Please pull in the following bugfix for xfs.  We forgot to drop a lock on
  error in xfs_readlink.  It hasn't been through -next yet, but there is no
  -next tree tomorrow.  The fix is clear so I'm sending this request today."

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: Fix missing xfs_iunlock() on error recovery path in xfs_readlink()
---

aaad641eadfd3e74b0fbb68fcf539b9cef0415d0