From: Linus Torvalds 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-Tag: v2.6.17-rc5~160 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=18552b8f227bddf569dade5c69798a37839ea913;p=linux-2.6-omap-h63xx.git 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. --- 18552b8f227bddf569dade5c69798a37839ea913