Merge branch 'master' of /repos/git/net-next-2.6 (62910554) · Commits · github.com / miet-riscv-workgroup / linux

Commit 62910554 authored Apr 20, 2010 by

Patrick McHardy

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>

parents 22265a5c ab930471

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment