projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8735779 c171b12)
Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 11:36:02 +0000 (12:36 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 11:36:02 +0000 (12:36 +0100)
commit5aa664d63391c14f52264eb08d70f8a074ae249e
tree539134746d006e25f1d893a3a170bb94388bd86etree | snapshot (tar.gz zip)
parent8735779774b8bbe14456c9e6ba4525eefc67a228commit | diff
parentc171b120c327e41278fc55d0b3d44be109dbf8c3commit | diff
Merge branch 'fix/sgtl5000' of git://git./linux/kernel/git/broonie/sound into asoc-sgtl5000

Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt
Documentation/devicetree/bindings/sound/sgtl5000.txt diff1 | diff2 | blob | history