tmp_suning_uos_patched/net/vmw_vsock
David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-07 18:37:01 -04:00
..
af_vsock.c VSOCK: Fix missing msg_namelen update in vsock_stream_recvmsg() 2013-04-07 16:28:02 -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