Merge branch 'bcmgenet'
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Aug 2014 22:10:17 +0000 (15:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Aug 2014 22:10:17 +0000 (15:10 -0700)
Florian Fainelli says:

====================
net: bcmgenet: Wake-on-LAN and suspend fixes

This patch series fixes some mistakes that were introduced during the driver
changes adding support suspend/resume and Wake-on-LAN.
====================

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

Trivial merge