]> git.baikalelectronics.ru Git - kernel.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)
commite56c316e749531ab7456b67e1d4e7739e49c4bd5
tree346fb0400de442aa5d87e58fbc02e5c899d74a03
parent6de8c0925d60e934a190fbc6f0700aa9dbc777ad
parent05cfc72f6943c1faf1542f0d6da85ffc700b5aab
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