diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:26:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:26:52 -0800 |
commit | ad658cec232771b11e95bb5f0d639d48f898a1f2 (patch) | |
tree | 7ef4ed87cbba8d8395f67c21af5c167d5de0293a /drivers/ata | |
parent | 2a1292b36ba106b9b7f030d3fa130f5f634fd8f0 (diff) | |
parent | 5a211a5deabcafdc764817d5b4510c767d317ddc (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
VM/Security: add security hook to do_brk
Security: round mmap hint address above mmap_min_addr
security: protect from stack expantion into low vm addresses
Security: allow capable check to permit mmap or low vm space
SELinux: detect dead booleans
SELinux: do not clear f_op when removing entries
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions