projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8ed8146
d8ec26d
)
Merge tag 'v3.13' into next
author
Paul Moore
<pmoore@redhat.com>
Thu, 23 Jan 2014 20:52:06 +0000
(15:52 -0500)
committer
Paul Moore
<pmoore@redhat.com>
Thu, 23 Jan 2014 20:52:06 +0000
(15:52 -0500)
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
1
2
security/selinux/hooks.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
security/selinux/hooks.c
Simple merge