Merge branch 'continental' of tglx.de:/home/jan/git/schulung into jan

Conflicts:
	Makefile

Signed-off-by: Manuel Traut <manut@linutronix.de>

1 files changed, 0 insertions, 57 deletions

diff --git a/linux-basics/linux-processes/pres_linux-processes_de.tex b/linux-basics/linux-processes/pres_linux-processes_de.tex
deleted file mode 100644
index e03216a..0000000
--- a/linux-basics/linux-processes/pres_linux-processes_de.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\documentclass{beamer}
-\usetheme{linutronix}
-\usepackage{german}
-\usepackage[utf8]{inputenc}
-\usepackage{pgf}
-\usepackage{graphicx}
-
-\title{Title of Presentation}
-%% \author{Hans-Jürgen Koch}
-\institute{Linutronix GmbH}
-
-\begin{document}
-
-\maketitle
-
-% ----- Slide 1 ------------------
-\begin{frame}
-%% \includegraphics[width=11cm]{myfirst.jpg}
-\end{frame}
-
-% ----- Slide 2 ------------------
-\begin{frame}
-\frametitle{A Frametitle}
-\pause
-\begin{itemize}
-\item Item 1
-\pause
-\item Item 2
-\pause
-\item Item 3
-\pause
-\item Item 4
-\pause
-\begin{block}{Important stuff}
-\end{block}
-\end{itemize}
-\end{frame}
-
-% ----- Slide with code --------------------------
-\begin{frame}[fragile]
-\frametitle{UIO interrupt handler}
-\begin{verbatim}
-static irqreturn_t my_handler(int irq,
-                              struct uio_info *dev_info)
-{
-    if (IRQ is not caused by my hardware)
-        return IRQ_NONE;
-
-    /* Disable interrupt */
-    (Perform some register access to silence the IRQ line)
-
-    return IRQ_HANDLED;
-}
-\end{verbatim}
-\end{frame}
-
-\end{document}