| commit | 18552b8f227bddf569dade5c69798a37839ea913 | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Fri, 12 May 2006 22:39:32 +0000 (12 15:39 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Fri, 12 May 2006 22:39:32 +0000 (12 15:39 -0700) | ||
| tree | 2538b43849d9ba6da32e1a309907c9ad488a939c | treesnapshot (tar.gz zip) |
| parent | faa88df860fdfad13afc99fc7201432f9263b3b5 | commitdiff |
| parent | bd89efc532fe41f867f848144cc8b42054ddf6f9 | commitdiff |
Merge /pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NEIGH]: Fix IP-over-ATM and ARP interaction.
[TG3]: ethtool always report port is TP.
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NEIGH]: Fix IP-over-ATM and ARP interaction.
[TG3]: ethtool always report port is TP.