David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
apparmor	Apparmor: Use d_is_positive/negative() rather than testing dentry->d_inode	2015-02-22 11:38:39 -05:00
integrity	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
keys	Don't leak a key reference if request_key() tries to use a revoked keyring	2015-02-16 13:45:16 +11:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
smack	Smack: Use d_is_positive() rather than testing dentry->d_inode	2015-02-22 11:38:40 -05:00
tomoyo	TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR()	2015-02-22 11:38:39 -05:00
yama
capability.c	Revert "selinux: add a skb_owned_by() hook"	2015-03-20 21:36:53 -04:00
commoncap.c	file->f_path.dentry is pinned down for as long as the file is open...	2015-01-25 23:16:27 -05:00
device_cgroup.c	cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes	2014-07-15 11:05:09 -04:00
inode.c	VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)	2015-02-22 11:38:41 -05:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64	2014-02-05 14:59:14 +00:00
lsm_audit.c	audit: anchor all pid references in the initial pid namespace	2014-03-20 10:11:55 -04:00
Makefile	security: cleanup Makefiles to use standard syntax for specifying sub-directories	2014-02-17 11:08:04 +11:00
min_addr.c
security.c	Revert "selinux: add a skb_owned_by() hook"	2015-03-20 21:36:53 -04:00