projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eeffd4b 1c07a4d)
Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:11:47 +0000 (16:11 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:11:47 +0000 (16:11 +0100)
commitbeb8962210f592bd285ed77559ac4458cc26f774
treef36bba55c0582758f89ac05dccff197b1bbd4d32tree | snapshot (tar.gz zip)
parenteeffd4b442eb2aa25257d8c6631b17cba685ccaccommit | diff
parent1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6commit | diff
Merge branch 'topic/owner' of git://git./linux/kernel/git/broonie/sound into asoc-ssm4567

Conflicts:
sound/soc/codecs/ssm4567.c
sound/soc/codecs/ssm4567.c diff1 | diff2 | blob | history