From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jun 2013 01:09:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.10-rc5~17
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1612e111e4e565422242727efb59499cce8738e4;p=linux-2.6-block.git

Merge git://git./linux/kernel/git/davem/net

Pull networking fix from David Miller:
 "This is a quick one commit pull request to cure the regression
  introduced by the MSG_CMSG_COMPAT change."

(Background: commit 1be374a0518a completely broke 32-bit COMPAT handling
by not only disallowing MSG_CMSG_COMPAT from user APIs, but clearing it
in our own internal use too!)

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Unbreak compat_sys_{send,recv}msg
---

1612e111e4e565422242727efb59499cce8738e4