From: Mark Brown <broonie@kernel.org>
Date: Fri, 24 Jul 2015 15:11:47 +0000 (+0100)
Subject: Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v4.3/fixes-rc1~91^2~7^2~20^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb8962210f592bd285ed77559ac4458cc26f774;p=pandora-kernel.git

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

Conflicts:
	sound/soc/codecs/ssm4567.c
---

beb8962210f592bd285ed77559ac4458cc26f774
Reading git-diff-tree failed