diff options
author | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:08 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:08 +0100 |
commit | 2ddaa6762696db4bb35726063b421782a9e0436f (patch) | |
tree | a84f564edcfca2f58c364fd021f4c82c9cfb211a /arch/m68k/mvme147 | |
parent | 367b1301ccbeae11adc4134182a055e7728aa9fe (diff) | |
parent | 83749abaafed348cdac6a63b5f76aa9b1b42409b (diff) | |
parent | 971edb0a0087b65bd3726d23b2dffff405d48f72 (diff) | |
parent | 3c9d3f1bc2defd418b5933bbc928096c9c686d3b (diff) | |
parent | eb3abaea7ea42619a48fa84e4b1ff48f1b18d863 (diff) | |
download | linux-2ddaa6762696db4bb35726063b421782a9e0436f.tar.bz2 |
Merge remote-tracking branches 'asoc/fix/rt5665', 'asoc/fix/simple', 'asoc/fix/sti' and 'asoc/fix/sun8i' into asoc-linus