Merge branch 'r8152-fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 27 Jul 2015 07:56:39 +0000 (00:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Jul 2015 07:56:39 +0000 (00:56 -0700)
Hayes Wang says:

====================
r8152: issues fix

v2:
Replace patch #2 with "r8152: fix wakeup settings".

v1:
These patches are used to fix issues.
====================

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

Trivial merge