From: David S. Miller Date: Mon, 17 Feb 2014 21:40:24 +0000 (-0500) Subject: Merge branch 'phy' X-Git-Tag: next-20140306~63^2~98 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92e8c831d831ff97913b71e178d184106c0dee0f;p=karo-tx-linux.git Merge branch 'phy' Florian Fainelli says: ==================== net: phy: soft reset rework for 10G PHYs As reported by Shaohui, 10G PHYs may have a slightly more complex reset sequence for which a BMCR_RESET software reset might not suffice. This patchset offers a solution for those by allowing them to implement their own soft_reset() callback. Finally there is an update to the PHY library Documentation to cover for the newly added callbacks of the PHY driver structure. Changes in v2: - fixed callback testing - fixed typo in Documentation ==================== Signed-off-by: David S. Miller --- 92e8c831d831ff97913b71e178d184106c0dee0f