Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
8cdb46da06
linux/net/vmw_vsock
History
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>
2013-04-30 03:55:20 -04:00
..
af_vsock.c VSOCK: Drop bogus __init annotation from vsock_init_tables() 2013-04-25 04:21:51 -04:00
af_vsock.h VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
Kconfig VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
Makefile VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
vmci_transport_notify_qstate.c VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
vmci_transport_notify.c VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
vmci_transport_notify.h VSOCK: Introduce VM Sockets 2013-02-10 19:41:08 -05:00
vmci_transport.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
vmci_transport.h VSOCK: Support VM sockets connected to the hypervisor. 2013-03-15 08:26:26 -04:00
vsock_addr.c VSOCK: Handle changes to the VMCI context ID. 2013-04-02 14:39:17 -04:00
vsock_addr.h VSOCK: Handle changes to the VMCI context ID. 2013-04-02 14:39:17 -04:00