diff options
| author |   Patrick McHardy <kaber@trash.net> | 2011-01-20 10:33:55 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-20 10:33:55 +0100 |
| commit | 82d800d8e7fa731b50deb851d16b68050673f587 (patch) | |
| tree | 60acee6699b1cdb7fe5e2802947737dffeeeb6c9 /include/linux/timerqueue.h | |
| parent | netfilter: do not omit re-route check on NF_QUEUE verdict (diff) | |
| parent | netfilter: xtables: connlimit revision 1 (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 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions