From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Feb 2010 03:51:45 +0000 (-0800)
Subject: Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: tegra-10.11.0~3198
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=0aa2ca9ae1e08d11661abb00ae6e75ff885448d6

Merge branch 'reiserfs/kill-bkl' of git://git./linux/kernel/git/frederic/random-tracing

* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  reiserfs: Fix softlockup while waiting on an inode
---

0aa2ca9ae1e08d11661abb00ae6e75ff885448d6