From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 Jun 2013 06:39:26 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.11-rc1~16^2~161
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=93a306aef5eef70e524500884ccca52c5dd19e17;p=users%2Fjedix%2Flinux-maple.git

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>
---

93a306aef5eef70e524500884ccca52c5dd19e17