Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/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
  • Loading branch information
@torvalds
torvalds committed Aug 5, 2010
2 parents f43100a + 06c22da commit c60c6a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/apparmor/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config SECURITY_APPARMOR
bool "AppArmor support"
depends on SECURITY
depends on SECURITY && NET
select AUDIT
select SECURITY_PATH
select SECURITYFS
Expand Down

0 comments on commit c60c6a9

Please sign in to comment.