diff options
author | David S. Miller <davem@davemloft.net> | 2012-06-11 15:56:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-11 15:56:14 -0400 |
commit | 67da25521066b38911701efa133aaad2238b5530 (patch) | |
tree | 776ad4942ce8294f0ba0013baf9527a1d39b424f /Documentation | |
parent | 7b34ca2ac7063f4ebf07f85fd75253ed84d5c648 (diff) | |
parent | 2597a8344ce051d0afe331706bcb4660bbdb9861 (diff) |
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 56000b33340..bc4b9c6eb80 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -414,21 +414,6 @@ Who: Jean Delvare <khali@linux-fr.org> | |||
414 | 414 | ||
415 | ---------------------------- | 415 | ---------------------------- |
416 | 416 | ||
417 | What: xt_connlimit rev 0 | ||
418 | When: 2012 | ||
419 | Who: Jan Engelhardt <jengelh@medozas.de> | ||
420 | Files: net/netfilter/xt_connlimit.c | ||
421 | |||
422 | ---------------------------- | ||
423 | |||
424 | What: ipt_addrtype match include file | ||
425 | When: 2012 | ||
426 | Why: superseded by xt_addrtype | ||
427 | Who: Florian Westphal <fw@strlen.de> | ||
428 | Files: include/linux/netfilter_ipv4/ipt_addrtype.h | ||
429 | |||
430 | ---------------------------- | ||
431 | |||
432 | What: i2c_driver.attach_adapter | 417 | What: i2c_driver.attach_adapter |
433 | i2c_driver.detach_adapter | 418 | i2c_driver.detach_adapter |
434 | When: September 2011 | 419 | When: September 2011 |
@@ -589,6 +574,13 @@ Why: Remount currently allows changing bound subsystems and | |||
589 | 574 | ||
590 | ---------------------------- | 575 | ---------------------------- |
591 | 576 | ||
577 | What: xt_recent rev 0 | ||
578 | When: 2013 | ||
579 | Who: Pablo Neira Ayuso <pablo@netfilter.org> | ||
580 | Files: net/netfilter/xt_recent.c | ||
581 | |||
582 | ---------------------------- | ||
583 | |||
592 | What: KVM debugfs statistics | 584 | What: KVM debugfs statistics |
593 | When: 2013 | 585 | When: 2013 |
594 | Why: KVM tracepoints provide mostly equivalent information in a much more | 586 | Why: KVM tracepoints provide mostly equivalent information in a much more |