[FE training-materials-updates] marvell-armada's head updated: Merge branch 'master' into marvell-armada (7ced1ac)

[Michael Opdenacker]

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

Branch 'marvell-armada' now includes:

     531cc09 Kernel slides: fix documentation links
     e9b3132 android: Blink replaced WebKit
     ea1f58e android: Support for the NFC has been there for quite some time
     e8c1916 Add sidekick photo
     8e1889c android: Add hardware introduction
     6a79b62 Make the kernel downloaded by a local manifest
     bb865b8 android: /sys/class/pwm has been introduced in 3.11
     996816a android: Remove confusing binder terminology slide
     bd2e030 android: remove duplicated instructions
     3439594 android: Move the ueventd fixup later (when we actually saw what it's for)
     b119be3 android: Fix the mlbin path
     738d82a android: Remove the checkout of the modifications
     bda943b sysdev: Move the realtime folder into sysdev
     92d215f Rename linux lab data folder to kernel for consistency
     d78430e common: Split labs generation
     1b0f9f2 makefile: factorize the Makefile generation logic
     9e228ce makefile: have the labs generate \training too
     e59e2ea setup: Adapt the setup lab to the new archive names
     ebc594d gen-lab-archive fix
     f0301e4 Update .gitignore file
     dc00f48 Setup lab: archive name fixes
     7ced1ac Merge branch 'master' into marvell-armada