Merge branch 'r8152-next'
authorDavid S. Miller <[email protected]>
Wed, 29 Oct 2014 19:09:16 +0000 (15:09 -0400)
committerDavid S. Miller <[email protected]>
Wed, 29 Oct 2014 19:09:16 +0000 (15:09 -0400)
Hayes Wang says:

====================
r8152: support nway_reset

Fix the CHECK from checkpatch.pl and support nway_reset.
====================

Signed-off-by: David S. Miller <[email protected]>

Trivial merge