From: David S. Miller <davem@davemloft.net>
Date: Fri, 8 Feb 2013 04:48:33 +0000 (-0500)
Subject: Merge branch 'tg3'
X-Git-Tag: v3.9-rc1~139^2~133
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b285109dde7b873b5dc671ef1b3ae3090f4bc72f;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'tg3'

Attention linux-next maintainer, you will hit a merge conflict between
this merge and the mips tree, the resolution is to preserve the removal
of uses of nvram_geenv() and nvram_parse_macaddr() from the net-next
side.

Hauke Mehrtens says:

====================
These patches are adding support for the Ethernet core found in the
BCM4705/BCM4785 SoC.

This is based on current master of davem/net-next.git.

v4:
 * move setting of DMA_RWCTRL_ONE_DMA

v3:
 * combined first two patches into one patch

v2:
 * use of struct sprom in ssb_gige_get_macaddr() instead of accessing
   the nvram directly
 * add return value to ssb_gige_get_macaddr()
 * try to read the mac address from ssb core before accessing the own
   registers.
 * fix two checkpatch warnings
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

b285109dde7b873b5dc671ef1b3ae3090f4bc72f