Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2013 06:39:26 +0000 (23:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2013 06:39:26 +0000 (23:39 -0700)
commit93a306aef5eef70e524500884ccca52c5dd19e17
tree13baf4c01c6cc86c5b5c1294fd0b9d05c85eedce
parent4df95131ea803bcb94f472d465c73ed57015c470
parent1612e111e4e565422242727efb59499cce8738e4
Merge git://git./linux/kernel/git/davem/net

Merge 'net' into 'net-next' to get the MSG_CMSG_COMPAT
regression fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/socket.c