Merge branch 'cpsw'
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Mar 2013 08:38:27 +0000 (04:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Mar 2013 08:38:27 +0000 (04:38 -0400)
commit99eee14a14ec8bf36c0705a038fa8d00917fb679
tree2c18692aae9f239b5748e5e973d0d71815e5286b
parentc1ad32af5ec281bf30d2ca4fa20415bd2edef181
parent11f2c988382b880e602a005c26436043c5d2c274
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>