diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-02 05:17:21 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-02 05:17:21 (GMT) |
| commit | c532cea97ae4b936cc634fa5e3ca04e57b106235 (patch) | |
| tree | 3468a865cc28d7c6bf743879a72751c9adfb6e7e /drivers/net/ethernet/micrel/ks8851.c | |
| parent | 019ee792d7861fde33e6c2331a8b32a2b975e865 (diff) | |
| parent | f8f6d679aaa78b989d9aee8d2935066fbdca2a30 (diff) | |
| download | linux-c532cea97ae4b936cc634fa5e3ca04e57b106235.tar.xz | |
Merge branch 'filter-next'
Daniel Borkmann says:
====================
BPF + test suite updates
These are the last bigger BPF changes that I had in my todo
queue for now. As the first two patches from this series
contain additional test cases for the test suite, I have
rebased them on top of current net-next with the set from [1]
applied to avoid introducing any unnecessary merge conflicts.
For details, please refer to the individual patches. Test
suite runs fine with the set applied.
[1] http://patchwork.ozlabs.org/patch/352599/
http://patchwork.ozlabs.org/patch/352600/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel/ks8851.c')
0 files changed, 0 insertions, 0 deletions