projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faa88df bd89efc)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 22:39:32 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 22:39:32 +0000 (15:39 -0700)
* 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.


Trivial merge
John Crispins staging tree