[FE training-materials-updates] "mainstream" -> "mainline"

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=b3d06769682d22080942a9ebad80ac2253f893c3

>---------------------------------------------------------------

commit b3d06769682d22080942a9ebad80ac2253f893c3
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Fri Jun 28 06:29:10 2013 +0200

    "mainstream" -> "mainline"
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

b3d06769682d22080942a9ebad80ac2253f893c3
 agenda/kernel-agenda.tex                           |    2 +-
 labs/kernel-module-simple/kernel-module-simple.tex |    2 +-
 slides/calao-board/calao-board.tex                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agenda/kernel-agenda.tex b/agenda/kernel-agenda.tex
index 9cbfb0b..4c44d83 100644
--- a/agenda/kernel-agenda.tex
+++ b/agenda/kernel-agenda.tex
@@ -428,7 +428,7 @@
 {Lecture - Managing kernel sources with git}
 {
   {\em Very useful to manage your changes to the Linux kernel
-    (drivers, board support code), staying in sync with mainstream
+    (drivers, board support code), staying in sync with mainline
     updates.}
   \begin{itemize}
   \item Cloning an existing git tree
diff --git a/labs/kernel-module-simple/kernel-module-simple.tex b/labs/kernel-module-simple/kernel-module-simple.tex
index e0ea694..afd7630 100644
--- a/labs/kernel-module-simple/kernel-module-simple.tex
+++ b/labs/kernel-module-simple/kernel-module-simple.tex
@@ -127,7 +127,7 @@ your development workstation!
 \section{Create a kernel patch}
 
 You can be proud of your new module! To be able to share it with
-others, create a patch which adds your new files to the mainstream
+others, create a patch which adds your new files to the mainline
 kernel.
 
 Test that your patch file is compatible with the patch command by
diff --git a/slides/calao-board/calao-board.tex b/slides/calao-board/calao-board.tex
index 16ae377..61bddd3 100644
--- a/slides/calao-board/calao-board.tex
+++ b/slides/calao-board/calao-board.tex
@@ -1,7 +1,7 @@
 \begin{frame}
 \frametitle{Hardware used in this training session}
   Calao Systems USB-A9263
-  Supported in mainstream Linux since version 2.6.27!
+  Supported in mainline Linux since version 2.6.27!
   \begin{columns}
     \column{0.6\textwidth}
     \begin{itemize}