git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f64822
465954c
)
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
author
James Morris
<james.l.morris@oracle.com>
Mon, 6 Jan 2014 14:45:59 +0000
(
01:45
+1100)
committer
James Morris
<james.l.morris@oracle.com>
Mon, 6 Jan 2014 14:45:59 +0000
(
01:45
+1100)
Conflicts:
security/selinux/hooks.c
Resolved using request struct.
Signed-off-by: James Morris <james.l.morris@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff