]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit59502e3bf5155f9094b8e5157d4a76a239dee38d
tree83f8fca138299584d47930d2509151ea38050253
parentb2f6ce5218c17025ff7e2fc76ce19ed2a27d6586
parent56926091e8b5b210781a5ccc453d7109b24d817c
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