Commit 18610ba9 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://lsm.bkbits.net/linus-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 3bfd74ba 7a19fd4a
......@@ -3,5 +3,6 @@
#
mainmenu_option next_comment
comment 'Security options'
define_bool CONFIG_SECURITY_CAPABILITIES y
tristate 'Capabilities Support' CONFIG_SECURITY_CAPABILITIES
endmenu
Markdown is supported
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