diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:55 +0000 |
| commit | 980aac20877e428406959391e6cb6b8dc3243ad2 (patch) | |
| tree | 47c62f3fb21281585905da76189f56e874d390fc /sound/soc/omap | |
| parent | cca1b08ff6996c41a4467d79977cecd3f49dd0a5 (diff) | |
| parent | e585ca342dbbfe7102985d9ed4eae3f9e1d77ced (diff) | |
| parent | 7f0af4ae86110c46b43fb57f2e0002aa81ca6a67 (diff) | |
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next