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)
commit50d5d2bd1d4273f1417135965a151e13f1f061c4
tree0b27e7731eb91424deffdcde1489891530c436a6
parent3ccec4bd10c95bbd8729b1edebef887b666905bf
parentec65cfce508885e433445036ab46f4ec91d32c5c
Merge branch 'sh_eth-next'

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>