diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-20 04:33:55 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-20 04:33:55 -0500 |
| commit | 82d800d8e7fa731b50deb851d16b68050673f587 (patch) | |
| tree | 60acee6699b1cdb7fe5e2802947737dffeeeb6c9 /Documentation/feature-removal-schedule.txt | |
| parent | 28a51ba59a1a983d63d4775e9bb8230fe0fb3b29 (diff) | |
| parent | cc4fc022571376412986e27e08b0765e9cb2aafb (diff) | |
Merge branch 'connlimit' of git://dev.medozas.de/linux
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 8c594c45b6a1..05b248aa91f1 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -611,3 +611,10 @@ Why: The adm9240, w83792d and w83793 hardware monitoring drivers have | |||
| 611 | Who: Jean Delvare <khali@linux-fr.org> | 611 | Who: Jean Delvare <khali@linux-fr.org> |
| 612 | 612 | ||
| 613 | ---------------------------- | 613 | ---------------------------- |
| 614 | |||
| 615 | What: xt_connlimit rev 0 | ||
| 616 | When: 2012 | ||
| 617 | Who: Jan Engelhardt <jengelh@medozas.de> | ||
| 618 | Files: net/netfilter/xt_connlimit.c | ||
| 619 | |||
| 620 | ---------------------------- | ||