projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1025c05 c894e39)
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)
commiteba17e6868059849fc2ffa79aabdd5b59f229fb9
tree25c40aff5f46f9de63b331be410fda46a5dddbcbtree | snapshot (tar.gz zip)
parent1025c05f727be33e065bb502a223637681c7991dcommit | diff
parentc894e394d4b96a57964aac6fda9253d47bafbbf7commit | diff
Merge branch 'topic/input' of git://git./linux/kernel/git/broonie/sound into asoc-cs42l51

Conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Kconfig diff1 | diff2 | blob | history