Merge branch 'depends/rmk/smp' into tmp