diff options
| author | Alexei Starovoitov <ast@fb.com> | 2017-04-06 21:20:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-06 21:21:59 +0200 |
| commit | 89c0a361301f81d76be5ab77c3f5470b88792670 (patch) | |
| tree | 920d7bcc637b2edebd2188c23b216caed6a62f1f /drivers/net | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-89c0a361301f81d76be5ab77c3f5470b88792670.tar.xz linux-89c0a361301f81d76be5ab77c3f5470b88792670.zip | |
selftests/bpf: fix merge conflict
fix artifact of merge resolution
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions