Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:11:47 +0000 (16:11 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:11:47 +0000 (16:11 +0100)
Conflicts:
sound/soc/codecs/ssm4567.c


Trivial merge