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-05-05 21:59:30 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-05 21:59:30 +0200
commita370e206b17a4b1e64f9d53e12a9c78829cbbd66 (patch)
tree0aec228778c49ce58dd6938793904902cf432d5e /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
parentfb8f64b7716fe6d20a7b0f0347f4706dd535146e (diff)
parent4fdfe982aedc1556d7754a55d2515f754d2b2e7d (diff)
downloadkernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.tar.gz
kernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.tar.xz
kernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc4.20200505git47cf1b422e60.1.vanilla.1.fc31
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 e7f261038..4e0b12ba9 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 ac2bdd45de75dea8c3dbe615d786933f0b2edc91 Mon Sep 17 00:00:00 2001
+From 95c97610a381fe253371edea24a9805877740004 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