Merge branches 'pinmux' and 'soc' into boards-base