tree c5002a93cf59827fb5f8506ff91a77cb826d90ae
parent 5193d7a7f500cfbbfc0de221e808208199723521
parent b7b7fa43103a9fb30dbcc60cbd5161fdfc25f904
author Linus Torvalds <torvalds@linux-foundation.org> 1270262934 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270262934 -0700

Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/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