Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 18:41:19 +0000 (14:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 18:41:19 +0000 (14:41 -0400)
commit3948b57bd592c05bd6c08b3fea0862473cf9d5d9
treefc89b580d76d0496fe0a3a60987a7cd5a265fdb9
parentb3fd82207e2723247aac478e8756451fe85b1ac2
parent833521ebc65b1c3092e5c0d8a97092f98eec595d
Merge branch '1GbE' of git://git./linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2017-06-07

This series contains a fix for e1000e and igb.

Colin Ian King fixes sparse warnings in igb by making functions static.

Chris Wilson provides a fix for a previous commit which is causing an
issue during suspend "e1000e_pm_suspend()", where we need to run
e1000e_pm_thaw() if __e1000_shutdown() is unsuccessful.
====================

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