[FE training-materials-updates] Merge branch 'master' of git.free-electrons.com:training-materials

[Thomas Petazzoni]

On Mon, 08 Oct 2012 21:29:52 +0200, Michael Opdenacker wrote:
> Repository : git://git.free-electrons.com/training-materials.git
> 
> On branch  : master
> Link       :
> http://git.free-electrons.com/training-materials/commit/?id=0d15a5b46d668938321ec4250d40653b48dba8fb
> 
> >---------------------------------------------------------------
> 
> commit 0d15a5b46d668938321ec4250d40653b48dba8fb
> Merge: cdba30a 96ec841
> Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
> Date:   Mon Oct 8 21:29:47 2012 +0200
> 
>     Merge branch 'master' of git.free-electrons.com:training-materials

git pull --rebase

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com