]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit61dac43ee6bedd8507294c7af8959157b686c221
treedebcce8f9747a00e4d46d4c90847952d1ed74360
parent8dff81e87d5c2867d7401f8ee7b1eb3e3aa2ba8d
parent98bb7399d29a53a58f497409f98acb3bc0434ded
Merge branch 'bcmgenet'

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>