Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2012 17:51:17 +0000 (12:51 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2012 17:51:17 +0000 (12:51 -0500)
commit8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8
tree31f32c0d9a548f0dbbe9f3a32aca5767093d98b4
parent3177bf6f922f62743133abbcbbbb5545f4133b2d
parente9296e89b85604862bd9ec2d54dc43edad775c0d
Merge git://git./linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/vhost/vhost.c
net/ipv4/ipmr.c
net/sctp/socket.c