diff options
author | James Morris <james.l.morris@oracle.com> | 2015-01-29 11:01:07 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-01-29 11:01:07 +1100 |
commit | 90200f19160734feceb92a3a054864c340242699 (patch) | |
tree | 01972a3ad03a473be2410af64c2a471d5931f135 /security/keys/Kconfig | |
parent | bfd33c4b4b1ac718d481efee10f3a16d88757577 (diff) | |
parent | 82b0b2c2b1e64ad6c5309a9eeba806af9812666b (diff) | |
download | linux-90200f19160734feceb92a3a054864c340242699.tar.gz |
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next
Diffstat (limited to 'security/keys/Kconfig')
0 files changed, 0 insertions, 0 deletions