diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:48 +0000 |
| commit | 1b9f1ae8907cb13d3d2538d98385b2744c9490d5 (patch) | |
| tree | 13d2aa2c2554ae57640c3a9f2fc1cf2ec1949170 | |
| parent | 7e00880eb5f74faeeada52099f3d67d3a932a5d4 (diff) | |
| parent | 03da09a02de2ffd15df89b9ddef17dd7af195f32 (diff) | |
| parent | a380acb88611e1ee90dcb3da39e05991cadc6682 (diff) | |
Merge remote-tracking branches 'asoc/topic/samsung' and 'asoc/topic/wm8750' into asoc-next