Eric Paris b7d3622a39 Linux 3.13 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJS3IyXAAoJEHm+PkMAQRiGplAH/ilCikBrCHyZ2938NHNLm+j1
 yhfYnEJHLNg7T69KEj3p0cNagO3v9RPWM6UYFBQ6uFIYNN1MBKO7U+mCZuMWzeO8
 +tGMV3mn5wx+oYn1RnWCCweQx5AESEl6rYn8udPDKh7LfW5fCLV60jguUjVSQ9IQ
 cvtKlWknbiHyM7t1GoYgzN7jlPrRQvcNQZ+Aogzz7uSnJAgwINglBAHS7WP2tiEM
 HAU2FoE4b3MbfGaid1vypaYQPBbFebx7Bw2WxAuZhkBbRiUBKlgF0/SYhOTvH38a
 Sjpj1EHKfjcuCBt9tht6KP6H56R25vNloGR2+FB+fuQBdujd/SPa9xDflEMcdG4=
 =iXnG
 -----END PGP SIGNATURE-----

Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.

2014-03-07 11:41:32 -05:00

..

apparmor

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2013-11-21 19:46:00 -08:00

integrity

ima: properly free ima_template_entry structures

2013-12-02 20:46:56 -05:00

keys

security: shmem: implement kernel private shmem inodes

2013-12-02 11:24:19 +00:00

selinux

Linux 3.13

2014-03-07 11:41:32 -05:00

smack

Linux 3.13

2014-03-07 11:41:32 -05:00

tomoyo

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

yama

yama: Better permission check for ptraceme

2013-03-26 13:17:58 -07:00

capability.c

Linux 3.12

2013-11-26 17:32:55 -05:00

commoncap.c

capabilities: allow nice if we are privileged

2013-08-30 23:44:09 -07:00

device_cgroup.c

device_cgroup: remove can_attach

2013-10-24 06:56:56 -04:00

inode.c

securityfs: fix object creation races

2012-01-10 10:20:35 -05:00

Kconfig

KEYS: Move the key config into security/keys/Kconfig

2012-05-11 10:56:56 +01:00

lsm_audit.c

Merge git://git.infradead.org/users/eparis/audit

2013-11-21 19:18:14 -08:00

Makefile

security: remove erroneous comment about capabilities.o link ordering

2013-09-24 11:26:28 +10:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

Linux 3.12

2013-11-26 17:32:55 -05:00