diff options
author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:44 +0000 |
commit | 9451a469280adb721e3eca5eb3526c3331c2847d (patch) | |
tree | 6ea96fe14aba5a02859de824870c11359dbb3521 /include | |
parent | b9546d09b178a8a6b3741958c85a18f2787ff37c (diff) | |
parent | a1e5e7e9b36f360bf75e4f0f7ceb899682f213bd (diff) | |
parent | 5c27087e4b43e2a5be144afe7250fb2b20bd47c4 (diff) | |
parent | c1f2a342846fbfd49ddc06ad7f0684d2c45b419d (diff) |
Merge remote-tracking branches 'asoc/topic/kcontrol', 'asoc/topic/max98357a' and 'asoc/topic/mtk' into asoc-next