Merge branch 'bcm7xxx-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2014 20:19:42 +0000 (16:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Mar 2014 20:19:42 +0000 (16:19 -0400)
commitb8b6529f0536cf0d9e35e0833732199b66bf7cbc
treee43a89355affefc56828825eabc337739f7f592c
parent61b905da33ae25edb6b9d2a5de21e34c3a77efe3
parenta62ea5a75fdd4c0052bdbacd1e653b00a9f88f6d
Merge branch 'bcm7xxx-next'

Florian Fainelli says:

====================
net: phy: bcm7xxx: workaround updates

This patch updates the BCM7xxx internal PHY workaround, this time with
defines for the registers we are touching.
====================

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