Patrick McHardy 6291055465 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>

2010-04-20 16:02:01 +02:00

7.6 KiB

Raw Blame History

View Raw