Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:48:54 +0000 (19:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:48:54 +0000 (19:48 -0700)
commit0afa80ab6ff9aac57f118463699cee306ad6ed8a
treec5002a93cf59827fb5f8506ff91a77cb826d90ae
parent5193d7a7f500cfbbfc0de221e808208199723521
parentb7b7fa43103a9fb30dbcc60cbd5161fdfc25f904
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 locking BUG during mount failure