Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into...
authorJames Morris <james.l.morris@oracle.com>
Mon, 10 Feb 2014 00:48:21 +0000 (11:48 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 10 Feb 2014 00:48:21 +0000 (11:48 +1100)
1  2 
security/selinux/ss/services.c

Simple merge