From: Linus Torvalds Date: Mon, 26 Feb 2007 20:06:43 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selin... X-Git-Tag: v2.6.21-rc2~39 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dafdcfba62f7ef23045f024a305168cac1c07590;p=linux-2.6 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6: Always initialize scontext and scontext_len Reassign printk levels in selinux kernel code --- dafdcfba62f7ef23045f024a305168cac1c07590