X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;fp=index.html;h=4c0af612a21ebfbb94a553305b68ba720f43b2cd;hb=dd646eeaf124aaab897bf9199bc0878fa69ce928;hp=7752d478ef551d48b92b731d2ee7f6035ac87a31;hpb=3c80807da28173e52f54f60665adce9571db11d2;p=debian-kernel-talk.git

diff --git a/index.html b/index.html
index 7752d47..4c0af61 100644
--- a/index.html
+++ b/index.html
@@ -4,11 +4,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>The Linux kernel in Debian - Ben Hutchings - Mini-DebConf Paris 2012</title>
+<title>The Linux kernel in Debian - Mini-DebConf Paris 2012</title>
 <!-- metadata -->
 <meta name="generator" content="S5" />
 <meta name="version" content="S5 1.1" />
-<meta name="author" content="Ben Hutchings" />
+<meta name="author" content="Ben Hutchings, Max Attems" />
 <!-- configuration parameters -->
 <meta name="defaultView" content="slideshow" />
 <meta name="controlVis" content="hidden" />
@@ -50,12 +50,12 @@
 <div class="slide">
 <h1>The Linux kernel in Debian</h1>
 <object data="tux-debian.svg" width="35%" align="right"></object>
-<h3>Ben Hutchings</h3>
+<h3>Ben Hutchings and Max Attems</h3>
 </div>
 
 <div class="slide">
-  <h1>The author</h1>
-  <ul class="incremental">
+  <h1>Ben Hutchings</h1>
+  <ul>
     <li>
       Professional software developer since 1998
     </li>
@@ -73,7 +73,7 @@
     </li>
     <li>
       Debian kernel contributor since 2008; uploader since 2009
-      <ul class="incremental">
+      <ul>
 	<li>
 	  Initially trying to deal with the non-free firmware issue
 	</li>
@@ -86,6 +86,13 @@
   </ul>
 </div>
 
+<div class="slide">
+  <h1>Max Attems</h1>
+  <ul>
+    <li>TODO</li>
+  </ul>
+</div>
+
 <div class="slide">
   <h1>Linux kernel</h1>
   <ul class="incremental">
@@ -180,7 +187,7 @@
   <ul class="incremental">
     <li>
       Currently 5 general maintainers: Maximilian Attems, Bastian
-      Blank, dann frazier, Moritz Muehlenhoff and me
+      Blank, dann frazier, Ben Hutchings, Moritz Muehlenhoff
     </li>
     <li>
       Many more specialised contributors:
@@ -414,7 +421,7 @@
     </li>
     <li>
       Also collected in linux-firmware.git repository maintained by
-      David Woodhouse and myself
+      David Woodhouse and Ben Hutchings
     </li>
   </ul>
 </div>
@@ -458,7 +465,7 @@
 Redistribution is free but has to include this notice.
       -->
       <ul>
-	<li>Modified by me to add Debian open-ND logo</li>
+	<li>Modified by Ben to add Debian open-ND logo</li>
       </ul>
     </li>
     <li>
