merge over commit 21412 ("sound-soc-qi_lb60: rename package as underscores are not...