| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 | [log] [tgz] |
|---|---|---|
| author | Patrick McHardy <kaber@trash.net> | Tue Apr 20 16:02:01 2010 +0200 |
| committer | Patrick McHardy <kaber@trash.net> | Tue Apr 20 16:02:01 2010 +0200 |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d [diff] | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 [diff] |
Merge branch 'master' of /repos/git/net-next-2.6 Conflicts: Documentation/feature-removal-schedule.txt net/ipv6/netfilter/ip6t_REJECT.c net/netfilter/xt_limit.c Signed-off-by: Patrick McHardy <kaber@trash.net>