Dean Nelson 24b41c972c e1000e: restore call to pci_clear_master() ... In attempting to resolve a minor merge conflict, commit e5f2ef7ab4 (Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) accidentally dropped a call to pci_clear_master() that was intended to remain in place. Commit 4e0855dff0 (e1000e: fix pci-device enable-counter balance) replaced a call to pci_disable_device() by one to pci_clear_master(). And then commit 66148babe7 (e1000e: fix runtime power management transitions) deleted a number of lines starting two lines following that call. This patch restores the call to pci_clear_master() in __e1000_shutdown(). v2: added summary lines (enclosed in parens) following commit IDs Signed-off-by: Dean Nelson <dnelson@redhat.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Acked-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>		2013-07-28 02:34:59 -07:00
..
e1000	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
e1000e	e1000e: restore call to pci_clear_master()	2013-07-28 02:34:59 -07:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
igbvf	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
ixgb	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
ixgbe	net: rename ll methods to busy-poll	2013-07-10 17:08:27 -07:00
ixgbevf	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
e100.c	e100: dump small buffers via %*ph	2013-07-28 02:06:38 -07:00
Kconfig	net: Move MII out from under NET_CORE and hide it	2013-06-19 22:22:56 -07:00
Makefile