From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 22:03:55 +0000 (-0800)
Subject: Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0~6299
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82062e7b50280bcf0feca70ac35a44f375602976;p=platform%2Fkernel%2Flinux-amlogic.git

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: Relax reiserfs_xattr_set_handle() while acquiring xattr locks
  reiserfs: Fix unreachable statement
  reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock
  reiserfs: Relax lock on xattr removing
  reiserfs: Relax the lock before truncating pages
  reiserfs: Fix recursive lock on lchown
  reiserfs: Fix mistake in down_write() conversion
---

82062e7b50280bcf0feca70ac35a44f375602976