projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
security/selinux/hooks.c

Resolved using request struct.

Signed-off-by: James Morris <james.l.morris@oracle.com>
1  2 
security/selinux/hooks.c patch | diff1 | diff2 | blob | history

diff --cc security/selinux/hooks.c
Simple merge
John Crispins staging tree