tree 0321bff42945768990a92c3770d4270497c0e8ee
parent dbd6a7cfead4fa2d7ad3fefe47168fcb146ac5ba
parent 31370f62baa1460b785cee9944bdcaf63d19e567
author Linus Torvalds <torvalds@linux-foundation.org> 1262988235 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262988235 -0800

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: 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