Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2010 18:46:18 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2010 18:46:18 +0000 (10:46 -0800)
commit13af75740f345a5ddb5f7020a688c0f96b0d9f1f
treee69606e57ab64979d02a165dd36e4abba79d32e0
parente20da891302c69d49fea181b4e49c33acc2305de
parentbbec919150037b8a2e58e32d3ba642ba3b6582a5
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 vmalloc call under reiserfs lock