VSOCK: get rid of vsock_version.h
authorDmitry Torokhov <dtor@vmware.com>
Mon, 18 Feb 2013 06:04:11 +0000 (06:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Feb 2013 20:02:51 +0000 (15:02 -0500)
There isn't really a need to have a separate file for it.

Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/vmw_vsock/af_vsock.c
net/vmw_vsock/vsock_version.h [deleted file]

Simple merge
diff --cc net/vmw_vsock/vsock_version.h
Simple merge