]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selin...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Feb 2007 20:06:43 +0000 (12:06 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Feb 2007 20:06:43 +0000 (12:06 -0800)
commitdafdcfba62f7ef23045f024a305168cac1c07590
tree346fb0400de442aa5d87e58fbc02e5c899d74a03
parentc90c69a508c2fd8d2f892c4b166baffc91111117
parent4f4acf3a478d5cada688f336f2229ab580f56113
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