summaryrefslogtreecommitdiffstats
path: root/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-30 06:01:03 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-30 06:01:03 +0200
commit9fb58390e2584fc06676753b7eafca91a863faa4 (patch)
treeaa94c6ee2ae7d12aac3762c45973a57e64da9cf4 /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
parent0c9c09e2873354ef28a3b5a74acd8884292e6fc4 (diff)
parent67f313c852f247a960a3b75eeff433ee42cd388c (diff)
downloadkernel-9fb58390e2584fc06676753b7eafca91a863faa4.tar.gz
kernel-9fb58390e2584fc06676753b7eafca91a863faa4.tar.xz
kernel-9fb58390e2584fc06676753b7eafca91a863faa4.zip
merge master
Diffstat (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch')
-rw-r--r--0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
index 9444872af..40920a633 100644
--- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
+++ b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
@@ -1,4 +1,4 @@
-From 41ce277c5128ae749021c0f6cb8bac6a4445844e Mon Sep 17 00:00:00 2001
+From 3b955d30aea59e0d70f725f9dd165248612c970a Mon Sep 17 00:00:00 2001
From: Aaron Ma <aaron.ma@canonical.com>
Date: Tue, 24 Mar 2020 03:16:39 +0800
Subject: [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode