diff options
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index a9c4245e2fd8..f487c6918d78 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -643,6 +643,5 @@ When: 2012 Why: superseded by xt_addrtype Who: Florian Westphal <fw@strlen.de> Files: include/linux/netfilter_ipv4/ipt_addrtype.h ->>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04 ---------------------------- |