Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:51:45 +0000 (19:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:51:45 +0000 (19:51 -0800)
commit0aa2ca9ae1e08d11661abb00ae6e75ff885448d6
treea770d55fd53b2658501672b5c0893cc1d91d5a07
parent76212a840f6edc2b89865f09464f3bd90125896d
parent175359f89df39f4faed663c8cfd6ee0222d2fa1e
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