summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 21:44:41 +0200
committerMark Brown <broonie@kernel.org>2016-09-29 21:44:41 +0200
commit5b56b9bb6ce64d72288a02dc3e8da5fc3eb0344a (patch)
tree7bf2db0afdda071842c795416ecfebbde61abb37 /sound
parentMerge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'aso... (diff)
parentASoC: sgtl5000: add headphone and LINEOUT mute controls (diff)
parentASoC: simple-card: add support for aux devices (diff)
parentASoC: stac9766: fix wrong usage of DECLARE_TLV_DB_LINEAR() (diff)
parentASoC: sti: fix missing clk_disable_unprepare() on error in uni_player_start() (diff)
parentASoC: sun4i-codec: Rename sun4i_codec_widgets for consistency (diff)
downloadlinux-5b56b9bb6ce64d72288a02dc3e8da5fc3eb0344a.tar.xz
linux-5b56b9bb6ce64d72288a02dc3e8da5fc3eb0344a.zip
Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/simple', 'asoc/topic/stac9766', 'asoc/topic/sti' and 'asoc/topic/sunxi' into asoc-next