diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-26 11:16:16 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:16:16 +0900 |
| commit | 9939b14b743f534005dfdaa1e519ff99c7a135c2 (patch) | |
| tree | 8bc3607c2befe3eb43c4e1c0fa7a79af26003a13 /sound | |
| parent | 71831ef6991138fa01fa3cc8e253b03e545e5af6 (diff) | |
| parent | ce7b8dbdded8552d1fd25cc9289da361c5cc765e (diff) | |
| parent | c570b82c5e6ac78be35b4e72594c0f1b1888fce1 (diff) | |
Merge remote-tracking branches 'asoc/topic/ssm2518' and 'asoc/topic/sunxi' into asoc-next