summaryrefslogtreecommitdiffstats
path: root/Patchlist.changelog
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-01 10:48:49 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-01 10:48:49 -0600
commit51aea159355a5cbfab3df1ad553d6a45728c77f0 (patch)
treebccf260ffa3b0194e923e448132079266c36f77e /Patchlist.changelog
parent7fe267231b1b6f424be7972f8ff7ec0afb4bddad (diff)
downloadkernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.tar.gz
kernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.tar.xz
kernel-51aea159355a5cbfab3df1ad553d6a45728c77f0.zip
kernel-5.12.0-0.rc1.162
* Mon Mar 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.0-0.rc1.162] - Fix merge issue (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'Patchlist.changelog')
-rw-r--r--Patchlist.changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 15ab6f9c9..465819eda 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/a512e1bf45d5712e94fb3aa47e20b7578dad0373
+ a512e1bf45d5712e94fb3aa47e20b7578dad0373 Fix merge issue
+
https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2
06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option