From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Mar 2013 20:18:53 +0000 (-0500)
Subject: Merge branch 'intel'
X-Git-Tag: firefly_0821_release~3680^2~921^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b4cd8a0535706ab3f47dd52f5650b11152080b3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'intel'

Jeff Kirsher says:

====================
This series contains updates to e1000e only.

All three patches come from Konstantin Khlebnikov to resolve power
management issues.  The first patch removes redundant and unbalanced
pci_disable_device() from the shutdown function.  The second patch
removes redundant actions from the driver and fixes the interaction
with actions in pci-bus runtime power management code.  The third
and last patch fixes some messages like 'Error reading PHY register'
and 'Hardware Erorr' and saves several seconds on reboot.
====================

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

8b4cd8a0535706ab3f47dd52f5650b11152080b3