[FE training-materials-updates] Merge branch 'master' into marvell-armada

[Michael Opdenacker]

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

On branch  : marvell-armada
Link       : http://git.free-electrons.com/training-materials/commit/?id=d2f26913dde3aeaa5404ea2a09c3478b54a6ecaf

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

commit d2f26913dde3aeaa5404ea2a09c3478b54a6ecaf
Merge: bd45b01 a2970b6
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Jul 23 14:51:57 2014 +0200

    Merge branch 'master' into marvell-armada
    
    - Include last lab path fixups



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

d2f26913dde3aeaa5404ea2a09c3478b54a6ecaf
 Makefile                                           |    2 +-
 .../kernel/modules/nfsroot/root/debugging/Makefile |    2 +-
 .../kernel/modules/nfsroot/root/hello/Makefile     |    2 +-
 .../kernel/modules/nfsroot/root/nunchuk/Makefile   |    2 +-
 .../kernel/modules/nfsroot/root/serial/Makefile    |    2 +-
 lab-data/sysdev/appdev/run_qemu                    |    2 +-
 .../host-vs-target.dia                             |   38 +++---
 labs/sysdev-tinysystem/host-vs-target.dia          |  127 ++++++++++----------
 labs/yocto-first-build/yocto-first-build.tex       |    2 +-
 9 files changed, 90 insertions(+), 89 deletions(-)