diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:17 +0000 |
| commit | e89817d4af75fed92e03c36427a83357a95dabd3 (patch) | |
| tree | 4ad1014e59ac5f062e2f20131fc4224da421ce72 /sound/soc | |
| parent | d84dbf33512d68b81f6a9635cff954f5b562a043 (diff) | |
| parent | bba1431211e6fdc56680d98d2bdabaab1fd13b79 (diff) | |
| parent | 5c4ca99df718f6569849ab5fabdf18c14755b144 (diff) | |
| parent | 4c121129c9dcb43b33d1cd568c8f2636e72597b0 (diff) | |
Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5645' and 'asoc/topic/rt5677' into asoc-next