diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-21 10:08:20 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-21 10:08:20 +0800 |
commit | 8cea869f71490e9e08b53e34dec030da2518bb3e (patch) | |
tree | 70f29f8bb38cf5218bac5e64931912ce1a7476cd /security/apparmor/include/apparmor.h | |
parent | 5af6a242945e39bf6ea39716d4eba316b735dce8 (diff) | |
parent | 70e00db9eb8ffc4dcaf5f035ec6a4440ba428794 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-16.03-androidlinux-linaro-lsk-v3.14-android
Diffstat (limited to 'security/apparmor/include/apparmor.h')
0 files changed, 0 insertions, 0 deletions