summaryrefslogtreecommitdiff
path: root/sound/soc/zte
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 17:59:18 +0300
committerMark Brown <broonie@kernel.org>2015-08-30 17:59:18 +0300
commit91931320cfbbcc1dd874c2d0aef62e7d90f07f70 (patch)
tree035224c0d42698e49358daffe143d73a09a7c4de /sound/soc/zte
parent02dc14d66e2047ca2d1bc7ed8ebef7f3415cf476 (diff)
parentca94085139d4874701af4f149bebfb05e105b245 (diff)
parentd32e03f0b6f9b4ad260feca1c5c938a882066de9 (diff)
parent534dcd7ea60cebc41816eff0c290700acb2cc43e (diff)
downloadlinux-91931320cfbbcc1dd874c2d0aef62e7d90f07f70.tar.xz
Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc/topic/zx296702' into asoc-next