diff options
author | David S. Miller <davem@davemloft.net> | 2021-08-30 09:59:11 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-08-30 09:59:11 +0100 |
commit | 724812d8561c32d2564a90c2fdf94fd7431658b4 (patch) | |
tree | d07779fa175f466a13cb903ad12ca773030b047b /Documentation/networking/nf_conntrack-sysctl.rst | |
parent | 27c779437cbc903d318c12a5f54ea151aa3f307f (diff) | |
parent | e9e506221b425f3c48fbace164d9d7543643ff1f (diff) |
Merge branch 'IXP46x-PTP-Timer'
Linus Walleij says:
====================
IXP46x PTP Timer clean-up and DT
ChangeLog v2->v3:
- Dropped the patch enabling compile tests: we are still dependent
on some machine-specific headers. The plan is to get rid of this
after device tree conversion. We include one of the compile testing
fixes anyway, because it is nice to have fixed.
- Rebased on the latest net-next
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking/nf_conntrack-sysctl.rst')
0 files changed, 0 insertions, 0 deletions