path: root/net
diff options
authorDavid S. Miller <davem@davemloft.net>2013-03-07 15:18:53 -0500
committerDavid S. Miller <davem@davemloft.net>2013-03-07 15:18:53 -0500
commit8b4cd8a0535706ab3f47dd52f5650b11152080b3 (patch)
tree9e708941b86049dff4fa936117031988a0d7cb7f /net
parentf8af75f3517a24838a36eb5797a1a3e60bf9e276 (diff)
parente60b22c5b7e59db09a7c9490b1e132c7e49ae904 (diff)
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions