tree cf73fa0f51aa4e0ff6d67ad0b143dfe5325d0f08
parent d0a47d32724bf0765b8768086ef1a7a6d074a7a0
parent f5aaaa6db62ac679ca42884cb8e22db7330cfca9
author David S. Miller <davem@davemloft.net> 1423377994 -0800
committer David S. Miller <davem@davemloft.net> 1423377994 -0800

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>