diff options
author | James Morris <james.l.morris@oracle.com> | 2013-04-02 01:45:36 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2013-04-02 01:45:36 +1100 |
commit | 9b0271d8ca4d99becbf9ca1871c0d0faa5fad676 (patch) | |
tree | e23f854c68dd553633b93ef4556607b1a143feaa /security/security.c | |
parent | d13274794ad28d90ac81643d3d1d18338d948764 (diff) | |
parent | cdb56b60884c687ea396ae96a418554739b40129 (diff) | |
download | talos-op-linux-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.tar.gz talos-op-linux-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.zip |
Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions