commit | aea187c46f7d03ce985e55eb1398d0776a15b928 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 20 16:58:03 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 20 16:58:03 2010 -0800 |
tree | a2f38121839fec4d91e06f2432478c00fba8df1b | |
parent | d0708b9739f4d184f74ef69fb15d9c26aecb3f10 [diff] | |
parent | 8f9941aeccc318f243ab3fa55aaa17f4c1cb33f9 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: CacheFiles: Fix a race in cachefiles_delete_object() vs rename vfs: don't call ima_file_check() unconditionally in nfsd_open() fs: inode - remove 8 bytes of padding on 64bits allowing 1 more objects/slab under slub Switch proc/self to nd_set_link() fix LOOKUP_FOLLOW on automount "symlinks"