]> Git Repo - linux.git/commitdiff
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <[email protected]>
Mon, 6 Jan 2014 14:45:59 +0000 (01:45 +1100)
committerJames Morris <[email protected]>
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 <[email protected]>
1  2 
security/selinux/hooks.c

Simple merge
This page took 0.123374 seconds and 4 git commands to generate.