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)
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>

Trivial merge