Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub...