]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 01:37:20 +0000 (17:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 01:37:20 +0000 (17:37 -0800)
commit5b0635fc4c2686d69c80fecd4f1627639c847c55
tree00a98c7f1a6e74eb840bace1db41fbee491c6472
parentb1865a82b6f321a4bf4c512f32d9255a03046ba9
parentfe9739a53466bdc99d044bae60566fdcafc8d01f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull SELinux fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()
  selinux: fix broken peer recv check