Merge branch 'sh_eth-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2016 20:07:21 +0000 (16:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2016 20:07:21 +0000 (16:07 -0400)
Sergei Shtylyov says:

====================
sh_eth: couple of software reset bit cleanups

   Here's a set of 2 patches against DaveM's 'net-next.git' repo. We clean up
the use of the software reset bits...
====================

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

Trivial merge