]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc0a6b4 c0c1439)
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)
commitb257bab5a635725466433b6cae90fd4f215c0ad5
tree00a98c7f1a6e74eb840bace1db41fbee491c6472tree
parentdc0a6b4fee04f99a3db3dd5affcce440dc0c4b7ecommit | diff
parentc0c1439541f5305b57a83d599af32b74182933fecommit | diff
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
Ubuntu Disco kernel mirror for Proxmox VE and PMG