Merge branch 'asm_cris_kbuild' into cris