| commit | 90c8570e0b9ad3b61c0cce8927cf02ba97b20d46 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Apr 02 20:52:41 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Apr 02 20:52:41 2021 +0000 |
| tree | 3c2052fdc85765032cb541db3fe7515b17d17a53 | |
| parent | 6f2d99bcd47c1b4c85199d7bbc8b23048e008840 [diff] | |
| parent | 8db4fe2ec83eebb7991644b9bf3ab0b88aaa90e7 [diff] |
Merge changes from topic "b183485987" * changes: ANDROID: re-add xt_IDLETIMER changes ANDROID: fix build for missing ETH_ALEN definition ANDROID: update to 1.8.7 version Merge tag 'v1.8.7' of git://git.netfilter.org/iptables Merge tag 'v1.8.6' of git://git.netfilter.org/iptables Merge tag 'v1.8.5' of git://git.netfilter.org/iptables ANDROID: revert to upstream xt_IDLETIMER