David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-03-25 20:29:20 -04: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

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

2014-01-06 22:23:01 +11:00

keys

KEYS: Make the keyring cycle detector ignore other keyrings of the same name

2014-03-09 18:57:18 -07:00

selinux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-25 20:29:20 -04:00

smack

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

2014-01-23 18:08:10 -08: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

selinux: add gfp argument to security_xfrm_policy_alloc and fix callers

2014-03-10 08:30:02 +01:00

commoncap.c

capabilities: allow nice if we are privileged

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

device_cgroup.c

cgroup: replace cftype->read_seq_string() with cftype->seq_show()

2013-12-05 12:28:04 -05:00

inode.c

…

Kconfig

security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64

2014-02-05 14:59:14 +00: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

…

security.c

selinux: add gfp argument to security_xfrm_policy_alloc and fix callers

2014-03-10 08:30:02 +01:00