| commit | 4cac04dd63fa3b202ee313ed1afbbd135ab887ee | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 7 Apr 2008 15:36:57 +0000 (7 08:36 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 7 Apr 2008 15:36:57 +0000 (7 08:36 -0700) | ||
| tree | 8fa7ed0186030297c69ac95530853eb5c860a894 | treesnapshot (tar.gz zip) |
| parent | e1c287b992d30dab86f1b1bfe1780d9d3a652b34 | commitdiff |
| parent | bfe87dbc7b4da5b05a1a78480e996787a500cc6f | commitdiff |
Merge git://git./linux/kernel/git/davem/net-2.6
* 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
* 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