tree 25c40aff5f46f9de63b331be410fda46a5dddbcb
parent 1025c05f727be33e065bb502a223637681c7991d
parent c894e394d4b96a57964aac6fda9253d47bafbbf7
author Mark Brown <broonie@linaro.org> 1399050035 -0700
committer Mark Brown <broonie@linaro.org> 1399050035 -0700

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

Conflicts:
	sound/soc/codecs/Kconfig