From: Linus Torvalds Date: Sat, 2 Dec 2006 00:43:42 +0000 (-0800) Subject: Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v2.6.20-rc2~6^2~13^2~475 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b07e3c3a1db0ce399d2a1d04860e1b901927c05e;p=linux-2.6-omap-h63xx.git 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 --- b07e3c3a1db0ce399d2a1d04860e1b901927c05e