tree 13baf4c01c6cc86c5b5c1294fd0b9d05c85eedce
parent 4df95131ea803bcb94f472d465c73ed57015c470
parent 1612e111e4e565422242727efb59499cce8738e4
author David S. Miller <davem@davemloft.net> 1370587166 -0700
committer David S. Miller <davem@davemloft.net> 1370587166 -0700

Merge git://git.kernel.org/pub/scm/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>