tree 83f8fca138299584d47930d2509151ea38050253
parent 5f64822d63efa20cee9efe8766b3a62ab6a1f6c3
parent 465954cd649a7d8cd331695bd24a16bcb5c4c716
author James Morris <james.l.morris@oracle.com> 1389019559 +1100
committer James Morris <james.l.morris@oracle.com> 1389019559 +1100

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>