diff options
author | 2017-04-06 07:25:07 -0700 | |
---|---|---|
committer | 2017-04-06 08:24:51 -0700 | |
commit | 6f14f443d3e773439fb9cc6f2685ba90d5d026c5 (patch) | |
tree | d45c11bba3458a805c4ac766ac85ebcf3c00b1eb /net/unix/af_unix.c | |
parent | bonding: attempt to better support longer hw addresses (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | wireguard-linux-6f14f443d3e773439fb9cc6f2685ba90d5d026c5.tar.xz wireguard-linux-6f14f443d3e773439fb9cc6f2685ba90d5d026c5.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple cases of overlapping changes (adding code nearby,
a function whose name changes, for example).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions