diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-23 15:11:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-23 16:41:27 -0700 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /include/linux/sock_diag.h | |
| parent | 6f359f99b8c2ff3b09329611da00fe39a7c10e7e (diff) | |
| parent | d038e3dcfff6e3de132726a9c7174d8170032aa4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/sock_diag.h')
0 files changed, 0 insertions, 0 deletions