X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=4bfc2ddbdccb69c706fa3687c2fafb6a1ff5714e;hp=f3e57f61e6e0edd4ea15dc13410bcdfd6e981520;hb=6a1d7451eaad13160ec0dc19e9483a320370a765;hpb=2039d2aa5957bab030591d8fc2bea3dc26459fe8

diff --git a/index.html b/index.html
index f3e57f6..4bfc2dd 100644
--- a/index.html
+++ b/index.html
@@ -50,7 +50,7 @@
 <div class="slide">
 <h1>The Linux kernel in Debian</h1>
 <object data="tux-debian.svg" width="35%" align="right"></object>
-<h3>Ben Hutchings and Max Attems</h3>
+<h3>Ben&nbsp;Hutchings and Max&nbsp;Attems</h3>
 </div>
 
 <div class="slide">
@@ -70,6 +70,12 @@
 	  and PCI code as necessary
 	</li>
       </ul>
+      <ul>
+	<li>
+	  Maintaining Linux 3.2.<var>y</var> stable update series on
+	  kernel.org
+	</li>
+      </ul>
     </li>
     <li>
       Debian kernel contributor since 2008; uploader since 2009
@@ -341,18 +347,18 @@
   </p>
   <ul class="incremental">
     <li>
-      OpenVZ and VServer - mostly reimplemented with cgroups and
-      namespaces
+      OpenVZ and VServer - being reimplemented upstream with cgroups
+      and namespaces
     </li>
     <li>
-      Xen - now upstream; Linux 3.0 is a useful dom0 kernel!
+      Xen - now upstream
     </li>
     <li>
       aufs - needed for Debian Live
     </li>
     <li>
       PREEMPT_RT - gradually being merged upstream; new option in
-      amd64 packages
+      amd64 and i386 packages
     </li>
   </ul>
 </div>