From: David S. Miller <davem@davemloft.net>
Date: Wed, 13 Mar 2013 08:38:27 +0000 (-0400)
Subject: Merge branch 'cpsw'
X-Git-Tag: v3.10-rc1~66^2~484
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=99eee14a14ec8bf36c0705a038fa8d00917fb679;p=linux-block.git

Merge branch 'cpsw'

Mugunthan V N says:

====================
This patch serires implements the following features in CPSW driver
* get/set phy link settings
* interrupt pacing
* get phy id via ioctl cmd SIOCGMIIPHY

Changes from initial version
* Made active-slave common for cpts, ethtool and SIOCGMIIPHY ioctl
* Cleaned CPSW DT binding documentation by seperating slave nodes
  under sub-section
* implemented get phy id via ioctl cmd SIOCGMIIPHY
====================

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

99eee14a14ec8bf36c0705a038fa8d00917fb679