Commit 57c4bada authored by Marek, Andreas (amarek)'s avatar Marek, Andreas (amarek)

Merge branch 'kernel' into master_pre_stage

parents 50bdd133 8fc1df8a