[FE training-materials-updates] android-kernel-changes-ion: ION is now mainlined

[Alexandre Belloni]

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

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

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

commit 48efe81d088ee6fb8d193ddbfd474cb1ad50efbe
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date:   Tue Feb 4 00:25:58 2014 +0100

    android-kernel-changes-ion: ION is now mainlined
    
    Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>


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

48efe81d088ee6fb8d193ddbfd474cb1ad50efbe
 .../android-kernel-changes-ion.tex                 |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/slides/android-kernel-changes-ion/android-kernel-changes-ion.tex b/slides/android-kernel-changes-ion/android-kernel-changes-ion.tex
index 8a9fa5a..1c3aed4 100644
--- a/slides/android-kernel-changes-ion/android-kernel-changes-ion.tex
+++ b/slides/android-kernel-changes-ion/android-kernel-changes-ion.tex
@@ -43,16 +43,14 @@
 \begin{frame}
   \frametitle{Comparison with mainline equivalents}
   \begin{itemize}
-  \item There is no direct equivalent to ION in the mainline
-    kernel. However:
+  ION has entered staging since 3.14. And:
     \begin{itemize}
     \item The contiguous allocation of the buffers is done through
       \code{CMA}
     \item The buffer sharing between devices is made through
       \code{dma-buf}
     \item Its userspace API also allows to allocate and share buffers
-      from the userspace, which is not possible right now in mainline
-      kernel
+      from the userspace, which was not possible otherwise.
     \item This API is also used to set the allocation constraints
       devices might have (for example, when one particular device can
       only access a subset of the memory, or when it needs to setup an