diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
| commit | 89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (patch) | |
| tree | 317c2721f3a641d3a9308c512532bfb384a4df06 /hibernate-Disable-in-a-signed-modules-environment.patch | |
| parent | c2e2a0849b034d919e0c2e27c36d77697579eb6b (diff) | |
| parent | b1223bfd6a6dd0bec9b3c0df7b286b22bcc35257 (diff) | |
| download | kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.gz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.xz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.zip | |
Merge branch 'master' into baytrail (3.18 bump)
Diffstat (limited to 'hibernate-Disable-in-a-signed-modules-environment.patch')
| -rw-r--r-- | hibernate-Disable-in-a-signed-modules-environment.patch | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch index e84c0dac8..6c89536a7 100644 --- a/hibernate-Disable-in-a-signed-modules-environment.patch +++ b/hibernate-Disable-in-a-signed-modules-environment.patch @@ -1,4 +1,3 @@ -From 720d3f956833c7d2bb8c13dd643496ef42636a0c Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Fri, 20 Jun 2014 08:53:24 -0400 Subject: [PATCH] hibernate: Disable in a signed modules environment @@ -14,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index a9dfa79b6bab..14c7356ff53a 100644 +index 1f35a3478f3c..5e2472fc3dda 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -28,6 +28,7 @@ |