From: David S. Miller Date: Fri, 14 Feb 2014 05:28:30 +0000 (-0500) Subject: Merge branch 'bcmgenet' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a56cddd8dcbd1410074cce0d5c1354fcbe635755;p=deliverable%2Flinux.git Merge branch 'bcmgenet' Florian Fainelli says: ==================== Support for the Broadcom GENET driver This patchset adds support for the Broadcom GENET Gigabit Ethernet MAC controller. This controller is found on the Broadcom BCM7xxx Set Top Box System-on-a-chips. Changes since v4: - add dependency on CONFIG_OF Changes since v3: - fixed Kconfig dependency on FIXED_PHY Changes since v2: - dropped the patch that adds an "internal" phy-mode ==================== Signed-off-by: David S. Miller --- a56cddd8dcbd1410074cce0d5c1354fcbe635755