From: Mark Brown <broonie@linaro.org>
Date: Fri, 2 May 2014 17:00:35 +0000 (-0700)
Subject: Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~21^2~52^2~5^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba17e6868059849fc2ffa79aabdd5b59f229fb9;p=pandora-kernel.git

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

Conflicts:
	sound/soc/codecs/Kconfig
---

eba17e6868059849fc2ffa79aabdd5b59f229fb9
Reading git-diff-tree failed