diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:50 +0100 |
| commit | 9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231 (patch) | |
| tree | 7ed4bbd01d1ba11f41aedaf48e81a37bdce94f8b /sound | |
| parent | 1ecf44503bc3287cb9e7b8661bffbfe225f14fea (diff) | |
| parent | e667487b67d96fc2471529e3a5b404f51dc52b39 (diff) | |
| parent | d8188f00e7f57412b5bb4405f636cb7c3d8f42a6 (diff) | |
Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc-next