Merge tag 'topic/twl' into for_3.4/pm/smps-regulator