| commit | eba17e6868059849fc2ffa79aabdd5b59f229fb9 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Fri May 02 10:00:35 2014 -0700 |
| committer | Mark Brown <broonie@linaro.org> | Fri May 02 10:00:35 2014 -0700 |
| tree | 25c40aff5f46f9de63b331be410fda46a5dddbcb | |
| parent | 1025c05f727be33e065bb502a223637681c7991d [diff] | |
| parent | c894e394d4b96a57964aac6fda9253d47bafbbf7 [diff] |
Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51 Conflicts: sound/soc/codecs/Kconfig