X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;h=a97baec9f54b327a200016606cda8a6bab6ed547;hb=626d02f02e5ce148221d53216865cbcf07a36c21;hp=b6b5cec04b4583bda086c8f0b729a27620588d96;hpb=944cc7984079c5a290a610acf823c8a730df0834;p=kernel-news-talk.git

diff --git a/index.html b/index.html
index b6b5cec..a97baec 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>What's new in the Linux kernel - DebConf 2013</title>
+<title>What's new in the Linux kernel - DebConf 2014</title>
 <!-- metadata -->
 <meta name="generator" content="S5" />
 <meta name="version" content="S5 1.1" />
@@ -39,7 +39,7 @@
 <div id="header">
 </div>
 <div id="footer">
-<h1>DebConf 2013</h1>
+<h1>DebConf 2014</h1>
 <h2>What's new in the Linux kernel</h2>
 </div>
 
@@ -64,8 +64,7 @@
       Regular Linux contributor in both roles since 2008
     </li>
     <li>
-      Maintaining a net driver in my day job, plus core networking
-      and PCI code as necessary
+      Working on various drivers and kernel code in my day job
     </li>
     <li>
       Debian kernel team member, now doing most of the unstable
@@ -84,10 +83,15 @@
     <li>
       Linux is released about 5 times a year (plus stable updates
       every week or two)
+      <ul>
+	<li>
+	  ...though some features aren't ready to use when they firat
+	  appear in a release
+	</li>
+      </ul>
     </li>
     <li>
-      For 'wheezy' we chose to freeze with Linux 3.2, which was
-      getting pretty old by the time of release
+      Since my talk last year, Linus has made 6 releases (3.11-3.16)
     </li>
     <li>
       Good news: we have lots of new kernel features in testing/unstable
