projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f64822 465954c)
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 14:45:59 +0000 (01:45 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 14:45:59 +0000 (01:45 +1100)
commitd4a82a4a033d563f1dc2c944eec2358cb38432d0
tree83f8fca138299584d47930d2509151ea38050253tree | snapshot
parent5f64822d63efa20cee9efe8766b3a62ab6a1f6c3commit | diff
parent465954cd649a7d8cd331695bd24a16bcb5c4c716commit | diff
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next

Conflicts:
security/selinux/hooks.c

Resolved using request struct.

Signed-off-by: James Morris <james.l.morris@oracle.com>
security/selinux/hooks.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.