| commit | 82d800d8e7fa731b50deb851d16b68050673f587 | [log] [tgz] |
|---|---|---|
| author | Patrick McHardy <kaber@trash.net> | Thu Jan 20 10:33:55 2011 +0100 |
| committer | Patrick McHardy <kaber@trash.net> | Thu Jan 20 10:33:55 2011 +0100 |
| tree | 60acee6699b1cdb7fe5e2802947737dffeeeb6c9 | |
| 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>