You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		12 years ago
..
Kconfig	…
Makefile	…
af_vsock.c	VSOCK: Drop bogus __init annotation from vsock_init_tables()	12 years ago
af_vsock.h	…
vmci_transport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
vmci_transport.h	VSOCK: Support VM sockets connected to the hypervisor.	12 years ago
vmci_transport_notify.c	…
vmci_transport_notify.h	…
vmci_transport_notify_qstate.c	…
vsock_addr.c	VSOCK: Handle changes to the VMCI context ID.	12 years ago
vsock_addr.h	VSOCK: Handle changes to the VMCI context ID.	12 years ago