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

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  fix endian lossage in forcedeth
  net/tokenring/olympic.c section fixes
  net: marvell.c fix sparse shadowed variable warning
  [VLAN]: Fix egress priority mappings leak.
  [TG3]: Add PHY workaround for 5784
  [NET]: srandom32 fixes for networking v2
  [IPV6]: Fix refcounting for anycast dst entries.
  [IPV6]: inet6_dev on loopback should be kept until namespace stop.
  [IPV6]: Event type in addrconf_ifdown is mis-used.
  [ICMP]: Ensure that ICMP relookup maintains status quo

...

This commit is contained in:

Linus Torvalds 2008-04-07 08:36:57 -07:00

parent e1c287b992 bfe87dbc7b

commit 4cac04dd63

11 changed files with 281 additions and 60 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

5

drivers/net/forcedeth.c

View file

2

drivers/net/phy/marvell.c

View file

154

drivers/net/tg3.c

View file

79

drivers/net/tg3.h

View file

6

drivers/net/tokenring/olympic.c

View file