Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Sun, 8 Feb 2015 06:46:34 +0000 (22:46 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 8 Feb 2015 06:46:34 +0000 (22:46 -0800)
Hayes Wang says:

====================
r8152: adjust the code

V2:
Correct the subject of patch #5. Replace "link feed" with "line feed".

v1:
Code adjustment.
====================

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

Trivial merge