Linus Torvalds 96784de59f Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux ... Pull SElinux fixes from Paul Moore: "Two small patches to fix a couple of build warnings in SELinux and NetLabel. The patches are obvious enough that I don't think any additional explanation is necessary, but it basically boils down to the usual: I was stupid, and these patches fix some of the stupid. Both patches were posted earlier this week to the SELinux list, and that is where they sat as I didn't think there were noteworthy enough to go upstream at this point in time, but DaveM would rather see them upstream now so who am I to argue. As the patches are both very small" * 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux: selinux: remove unused variabled in the netport, netnode, and netif caches netlabel: fix the netlbl_catmap_setlong() dummy function		2014-08-09 15:09:52 -07:00
..
apparmor	sched: move no_new_privs into new atomic flags	2014-07-18 12:13:38 -07:00
integrity	ima: add support for measuring and appraising firmware	2014-07-25 11:47:46 -07:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-08-06 08:06:39 -07:00
selinux	Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux	2014-08-09 15:09:52 -07:00
smack	Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next	2014-08-02 22:58:02 +10:00
tomoyo	tomoyo: Use sensible time interface	2014-06-12 16:18:45 +02:00
yama
capability.c	security: introduce kernel_fw_from_file hook	2014-07-25 11:47:45 -07:00
commoncap.c	CAPABILITIES: remove undefined caps from all processes	2014-07-24 21:53:47 +10:00
device_cgroup.c	cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes	2014-07-15 11:05:09 -04:00
inode.c
Kconfig
lsm_audit.c	audit: anchor all pid references in the initial pid namespace	2014-03-20 10:11:55 -04:00
Makefile
min_addr.c
security.c	ima: add support for measuring and appraising firmware	2014-07-25 11:47:46 -07:00