David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

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

2014-03-14 22:31:55 -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-05 20:32:02 -05:00

smack

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

2014-01-23 18:08:10 -08:00

tomoyo

…

yama

…

capability.c

Merge tag 'v3.12'

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

commoncap.c

…

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

…

min_addr.c

…

security.c

Merge tag 'v3.12'

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