Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Fri, 2 May 2014 17:00:35 +0000 (10:00 -0700)
committerMark Brown <broonie@linaro.org>
Fri, 2 May 2014 17:00:35 +0000 (10:00 -0700)
Conflicts:
sound/soc/codecs/Kconfig


Trivial merge