Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Sun, 28 Sep 2014 21:24:32 +0000 (17:24 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Sep 2014 21:24:32 +0000 (17:24 -0400)
commita8404ce5ae7a6054322afb5aa77cefe3ad54475e
treed068ba8cc4ee9a19fa8c278b3215cc21b13dce97
parent18c565eb410307f9eefbef7c9021c7a75d8a2408
parentdf35d283e5a98b654a06301c5668fe85ab538452
Merge branch 'r8152'

Hayes Wang says:

====================
r8152: support setting eee by ethtool

Modify some definitions about EEE, and add the support of setting
the EEE through ethtool.
====================

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