]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74a7f6a 9b025eb)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2012 23:36:44 +0000 (15:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2012 23:36:44 +0000 (15:36 -0800)
commitaaad641eadfd3e74b0fbb68fcf539b9cef0415d0
treed8b8a65b84e3c2be1b697f205c75dd970538aef2tree | snapshot
parent74a7f6a0a61f1f5addd0afa789785f4cefcfcafccommit | diff
parent9b025eb3a89e041bab6698e3858706be2385d692commit | diff
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()
Linux kernel for KaRo TX COM modules