Merge branch 'r8152-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Oct 2014 19:09:16 +0000 (15:09 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Oct 2014 19:09:16 +0000 (15:09 -0400)
commit8b243a61940d2ca3c3a370e551b88d47a09ede0c
treed6899f66d352b03aa2bc70deb6fbb8c09afd7b1e
parentdca145ffaa8d39ea1904491ac81b92b7049372c0
parent8884f5078085a3cd4dc9c24bc81e00177c49cf5b
Merge branch 'r8152-next'

Hayes Wang says:

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

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

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