diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
commit | 5403e7c67e6625df392da2438d02c70442fd1952 (patch) | |
tree | 988c327386789b1b9fefe7ba1cebed2c7a387b32 /configs/fedora/generic/CONFIG_NF_CONNTRACK | |
parent | b1e22a960e2a6f39797e7d2022994df2176ad1e9 (diff) | |
parent | 0310b312a7e5dffcdf24ae835ed732f7a6a9c471 (diff) | |
download | kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.gz kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.xz kernel-5403e7c67e6625df392da2438d02c70442fd1952.zip |
blindly merge master, no adjustments to the new world order yet
Diffstat (limited to 'configs/fedora/generic/CONFIG_NF_CONNTRACK')
-rw-r--r-- | configs/fedora/generic/CONFIG_NF_CONNTRACK | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/fedora/generic/CONFIG_NF_CONNTRACK b/configs/fedora/generic/CONFIG_NF_CONNTRACK deleted file mode 100644 index 6eb10bb34..000000000 --- a/configs/fedora/generic/CONFIG_NF_CONNTRACK +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NF_CONNTRACK=m |