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

Browse Source

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>

...

This commit is contained in:

Patrick McHardy

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

parent 22265a5c3c ab9304717f

commit 6291055465

5616 changed files with 132602 additions and 35025 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

829

net/ipv4/ipmr.c

File diff suppressed because it is too large Load Diff