X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=546aa047b0752efc8449c7b80e70e048d6f4fde5;hp=d669f743d3a2b0f33503908c4ceceeeed06ed87e;hb=c8b14f5b155cd82efe7a494daede15e5c9f3b612;hpb=fc904e2681097d28049c2b225506dcf7faeb9bca

diff --git a/index.html b/index.html
index d669f74..546aa04 100644
--- a/index.html
+++ b/index.html
@@ -86,6 +86,28 @@
 
 <div class="slide">
   <h1>Linux kernel</h1>
+  <ul class="incremental">
+    <li>
+      Started by Linus Torvalds in 1991 as a kernel for i386
+      PCs: <q>just a hobby, won't be big and professional like gnu</q>
+    </li>
+    <li>
+      Adopted as the kernel of the Debian system in 1993
+    </li>
+    <li>
+      After 20 years' development, supports more hardware
+      architectures and devices than anything else
+      <ul class="incremental">
+	<li>
+	  Hardware vendors <em>must</em> provide Linux drivers because
+	  their customers demand it
+	</li>
+      </ul>
+    </li>
+    <li>
+      Still the default kernel for the Debian system
+    </li>
+  </ul>
 </div>
 
 <div class="slide">
@@ -120,5 +142,38 @@
   <h1>Questions?</h1>
 </div>
 
+<div class="slide">
+  <h1>Credits</h1>
+  <ul>
+    <li>
+      DebConf 11 logo &copy; Aur&eacute;lio A. Heckert.
+      <!--
+This program is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation;
+version 2 of the License.
+
+This program is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more
+details.
+
+You should have received a copy of the GNU General Public
+License along with this package; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301 USA
+
+On Debian systems, the full text of the GNU General Public
+License version 2 can be found in the file
+`/usr/share/common-licenses/GPL-2'.
+      -->
+      <ul>
+	<li>Resized and coloured by me</li>
+      </ul>
+    </li>
+  </ul>
+</div>
+
 </body>
 </html>