diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 14:03:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 14:03:55 -0800 |
commit | 82062e7b50280bcf0feca70ac35a44f375602976 (patch) | |
tree | 0321bff42945768990a92c3770d4270497c0e8ee /mm/memcontrol.c | |
parent | dbd6a7cfead4fa2d7ad3fefe47168fcb146ac5ba (diff) | |
parent | 31370f62baa1460b785cee9944bdcaf63d19e567 (diff) | |
download | linux-3.10-82062e7b50280bcf0feca70ac35a44f375602976.tar.gz linux-3.10-82062e7b50280bcf0feca70ac35a44f375602976.tar.bz2 linux-3.10-82062e7b50280bcf0feca70ac35a44f375602976.zip |
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
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions