Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2006-01-10 21:29:53 -08:00

parent d274ba2081 5bf887f2ff

commit 35d138ae22

2 changed files with 6 additions and 2 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

3

net/ipv6/Makefile

View file

5

net/ipv6/netfilter.c

View file