Skip to content
GitLab
Commit 41be702a authored by Paul Moore's avatar Paul Moore
Browse files

Merge tag 'v3.13' into next 

Linux 3.13

Minor fixup needed in selinux_inet_conn_request()

Conflicts:
	security/selinux/hooks.c
parents 8ed81460 d8ec26d7
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment