summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-03-29 12:55:08 +0100
committerMark Brown <broonie@kernel.org>2017-03-29 12:55:08 +0100
commit2ddaa6762696db4bb35726063b421782a9e0436f (patch)
treea84f564edcfca2f58c364fd021f4c82c9cfb211a /drivers
parent367b1301ccbeae11adc4134182a055e7728aa9fe (diff)
parent83749abaafed348cdac6a63b5f76aa9b1b42409b (diff)
parent971edb0a0087b65bd3726d23b2dffff405d48f72 (diff)
parent3c9d3f1bc2defd418b5933bbc928096c9c686d3b (diff)
parenteb3abaea7ea42619a48fa84e4b1ff48f1b18d863 (diff)
downloadlinux-2ddaa6762696db4bb35726063b421782a9e0436f.tar.bz2
Merge remote-tracking branches 'asoc/fix/rt5665', 'asoc/fix/simple', 'asoc/fix/sti' and 'asoc/fix/sun8i' into asoc-linus