Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51 Conflicts: sound/soc/codecs/Kconfig
