Skip to content
Snippets Groups Projects
Commit c60c6a96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  apparmor: depends on NET
parents f43100ae 06c22dad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
security/apparmor/Kconfig
+ 1
− 1
View file @ c60c6a96
config SECURITY_APPARMOR
bool "AppArmor support"
depends on SECURITY
depends on SECURITY && NET
select AUDIT
select SECURITY_PATH
select SECURITYFS
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment