diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-23 17:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-23 17:37:20 -0800 |
| commit | b257bab5a635725466433b6cae90fd4f215c0ad5 (patch) | |
| tree | 00a98c7f1a6e74eb840bace1db41fbee491c6472 /drivers/ata/libata-core.c | |
| parent | dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e (diff) | |
| parent | c0c1439541f5305b57a83d599af32b74182933fe (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
Diffstat (limited to 'drivers/ata/libata-core.c')
0 files changed, 0 insertions, 0 deletions