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

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: silence a warning in ebtables
  [IPV6]: File the fingerprints off ah6->spi/esp6->spi
  [TCP]: Set default congestion control when no sysctl.
  [TIPC] net/tipc/port.c: fix NULL dereference

...

This commit is contained in:

Linus Torvalds 2006-11-02 08:50:46 -08:00

parent 0ca2b776ab 6f5b7ef6b5

commit eb193e4051

5 changed files with 14 additions and 12 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

2

net/bridge/netfilter/ebtables.c

View file

7

net/ipv4/sysctl_net_ipv4.c

View file

8

net/ipv4/tcp_cong.c

View file

4

net/ipv6/xfrm6_tunnel.c

View file

5

net/tipc/port.c

View file