Merge branch 'next' into temp-c169-development

diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index 068cc36d3e6ac5acfed39393893a5b1bc224e376..568e9d481b5f861ff91830617008cc2cefcd8b24 100644 (file)
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -95,6 +95,10 @@ lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b
 lib/firmware/intel-ucode/06-8e-0c
 lib/firmware/intel-ucode/06-96-01
+lib/firmware/intel-ucode/06-97-02
+lib/firmware/intel-ucode/06-97-05
+lib/firmware/intel-ucode/06-9a-03
+lib/firmware/intel-ucode/06-9a-04
 lib/firmware/intel-ucode/06-9c-00
 lib/firmware/intel-ucode/06-9e-09
 lib/firmware/intel-ucode/06-9e-0a
@@ -107,6 +111,8 @@ lib/firmware/intel-ucode/06-a5-05
 lib/firmware/intel-ucode/06-a6-00
 lib/firmware/intel-ucode/06-a6-01
 lib/firmware/intel-ucode/06-a7-01
+lib/firmware/intel-ucode/06-bf-02
+lib/firmware/intel-ucode/06-bf-05
 lib/firmware/intel-ucode/0f-00-07
 lib/firmware/intel-ucode/0f-00-0a
 lib/firmware/intel-ucode/0f-01-02

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 26cbc4f6dce31f3dc15d6ac4d011453e963d7ad8..bfb7925401727b300598b2ddb1ba3b759e04c60b 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -73,8 +73,8 @@ Jan Paul Tücking,
 Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
-Alf Høgemark,
 Leo-Andres Hofmann,
+Alf Høgemark,
 Ben Schweikert,
 Daniel Weismüller,
 Peter Pfeiffer,