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)
commit57ee062e4baa9532e5a3835a2d185590a3fc8bd3
treecf73fa0f51aa4e0ff6d67ad0b143dfe5325d0f08
parentd0a47d32724bf0765b8768086ef1a7a6d074a7a0
parentf5aaaa6db62ac679ca42884cb8e22db7330cfca9
Merge branch 'r8152'

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>