net/bridge/br_input.c · c4b5be98fe78508e7199d6919eb712feba9a4f01 · KED Software Projects / Miscellaneous / KED Linux Kernel Fork

14 years ago

Merge branch 'master' of /repos/git/net-next-2.6 · 62910554

Patrick McHardy authored 14 years ago


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>

62910554

History

Merge branch 'master' of /repos/git/net-next-2.6

Patrick McHardy authored 14 years ago


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>