Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Thu, 29 Nov 2012 17:51:17 +0000 (12:51 -0500)]
Signed-off-by: David S. Miller <davem@davemloft.net>

1  2 
drivers/vhost/vhost.c
net/ipv4/ipmr.c
net/sctp/socket.c

Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge
Simple merge