diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 13:03:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 13:03:27 -0700 |
| commit | 31111c26d976ca0f298312f08e44cdb078005b03 (patch) | |
| tree | ca08ef55b2ea91f9e69f8a78bb8b4363a1759b54 /Documentation/feature-removal-schedule.txt | |
| parent | 0c0217b016ba8a970a6f6ab62ad0d858f39881ca (diff) | |
| parent | 2f5dc63123905a89d4260ab8ee08d19ec104db04 (diff) | |
| download | linux-31111c26d976ca0f298312f08e44cdb078005b03.tar.gz linux-31111c26d976ca0f298312f08e44cdb078005b03.tar.bz2 linux-31111c26d976ca0f298312f08e44cdb078005b03.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index d6f5255ca547..a9c4245e2fd8 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -637,3 +637,12 @@ Why: The original implementation of memsw feature enabled by Who: Michal Hocko <mhocko@suse.cz> ---------------------------- + +What: ipt_addrtype match include file +When: 2012 +Why: superseded by xt_addrtype +Who: Florian Westphal <fw@strlen.de> +Files: include/linux/netfilter_ipv4/ipt_addrtype.h +>>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04 + +---------------------------- |