diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:44:40 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:44:40 -1000 |
commit | 24f0eed2668b059e847ff145848ddacb75419acc (patch) | |
tree | 010c89c06e191b068f8a078b10bfaf1d3699c834 /ipc/shm.c | |
parent | 8b6b4628126fd73d0a53b499a26133c15b73c1e6 (diff) | |
parent | 3567866bf26190d1e734c975c907eb06e923ba23 (diff) | |
download | op-kernel-dev-24f0eed2668b059e847ff145848ddacb75419acc.zip op-kernel-dev-24f0eed2668b059e847ff145848ddacb75419acc.tar.gz |
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:
RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached
get rid of boilerplate switches in posix_acl.h
fix block device fallout from ->fsync() changes
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions