diff options
author | David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
commit | 93a306aef5eef70e524500884ccca52c5dd19e17 (patch) | |
tree | 13baf4c01c6cc86c5b5c1294fd0b9d05c85eedce /Kbuild | |
parent | 4df95131ea803bcb94f472d465c73ed57015c470 (diff) | |
parent | 1612e111e4e565422242727efb59499cce8738e4 (diff) | |
download | linux-93a306aef5eef70e524500884ccca52c5dd19e17.tar.bz2 |
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>
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions