diff options
| author | James Morris <[email protected]> | 2009-08-19 23:18:42 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2009-08-19 23:18:42 +0000 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /security/selinux/include/class_to_string.h | |
| parent | Security/SELinux: remove duplicated #include (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| download | kernel-ece13879e74313e62109e0755dd3d4f172df89e2.tar.gz kernel-ece13879e74313e62109e0755dd3d4f172df89e2.zip | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <[email protected]>
Diffstat (limited to 'security/selinux/include/class_to_string.h')
0 files changed, 0 insertions, 0 deletions