Merge branch 'topic/owner' of...

Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567

Conflicts:
	sound/soc/codecs/ssm4567.c