tree 2538b43849d9ba6da32e1a309907c9ad488a939c
parent faa88df860fdfad13afc99fc7201432f9263b3b5
parent bd89efc532fe41f867f848144cc8b42054ddf6f9
author Linus Torvalds <torvalds@g5.osdl.org> 1147473572 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1147473572 -0700

Merge master.kernel.org:/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.