Merge branch 'net-ethernet-use-generic-power-management'