diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 16:03:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 16:03:27 -0400 |
| commit | 31111c26d976ca0f298312f08e44cdb078005b03 (patch) | |
| tree | ca08ef55b2ea91f9e69f8a78bb8b4363a1759b54 /Documentation/feature-removal-schedule.txt | |
| parent | 0c0217b016ba8a970a6f6ab62ad0d858f39881ca (diff) | |
| parent | 2f5dc63123905a89d4260ab8ee08d19ec104db04 (diff) | |
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 | |||
| 637 | Who: Michal Hocko <mhocko@suse.cz> | 637 | Who: Michal Hocko <mhocko@suse.cz> |
| 638 | 638 | ||
| 639 | ---------------------------- | 639 | ---------------------------- |
| 640 | |||
| 641 | What: ipt_addrtype match include file | ||
| 642 | When: 2012 | ||
| 643 | Why: superseded by xt_addrtype | ||
| 644 | Who: Florian Westphal <fw@strlen.de> | ||
| 645 | Files: include/linux/netfilter_ipv4/ipt_addrtype.h | ||
| 646 | >>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04 | ||
| 647 | |||
| 648 | ---------------------------- | ||