diff options
| author | Patrick McHardy <kaber@trash.net> | 2015-06-13 14:50:25 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2015-06-13 14:50:25 +0200 |
| commit | 3ebcddc54c6e3016bc8eb61e4d1ca2f9ca5cd310 (patch) | |
| tree | c9fb7eca019a313d0825bd52eed17a364e32ec4b /include/linux/netfilter.h | |
| parent | 077509fdea3aa009823491be7096749c84795874 (diff) | |
netlink_delinarize: fix merge conflict
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/netfilter.h')
0 files changed, 0 insertions, 0 deletions