From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 12 May 2006 22:39:32 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18552b8f227bddf569dade5c69798a37839ea913;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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.
---

18552b8f227bddf569dade5c69798a37839ea913