David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
af_vsock.c	VSOCK: do not disconnect socket when peer has shutdown SEND only	2016-05-05 23:31:29 -04:00
Kconfig	Revert "Merge branch 'vsock-virtio'"	2015-12-08 21:55:49 -05:00
Makefile	Revert "Merge branch 'vsock-virtio'"	2015-12-08 21:55:49 -05:00
vmci_transport.c	VSOCK: constify vsock_transport structure	2016-05-03 13:03:05 -04:00
vmci_transport.h	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vmci_transport_notify.c	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vmci_transport_notify.h	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vmci_transport_notify_qstate.c	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vsock_addr.c	VSOCK: Move af_vsock.h and vsock_addr.h to include/net	2013-07-27 22:14:06 -07:00