From: Linus Torvalds Date: Tue, 24 Dec 2013 01:37:20 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: firefly_0821_release~176^2~4724 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b257bab5a635725466433b6cae90fd4f215c0ad5;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./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 --- b257bab5a635725466433b6cae90fd4f215c0ad5