commit | b07e3c3a1db0ce399d2a1d04860e1b901927c05e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 01 16:43:42 2006 -0800 |
committer | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 01 16:43:42 2006 -0800 |
tree | 474c17e969b5462a3702f0021249e1d78522ac35 | |
parent | 5f56bbdf1e35d41b4b3d4c92bdb3e70c63877e4d [diff] | |
parent | b94c7e677b9d28bd3f9ba4a70df6bfa7942867ca [diff] |
Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: validate kernel object classes and permissions SELinux: ensure keys constant in hashtab_search SELinux: export object class and permission definitions SELinux: remove current object class and permission validation mechanism