]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bcmgenet'
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Feb 2014 05:28:30 +0000 (00:28 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Feb 2014 05:28:30 +0000 (00:28 -0500)
commitb41b53dbdc4b583f84a2e48df7519d631873374a
treef93f6823c932572ef20c6688ff84e75a1f259424
parent0b0103d3c687f3c2361a9ca1a34f523bfa1cfd44
parent112b258bff612e053644c0a3c7bb93d0355ebe4f
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 <davem@davemloft.net>