diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-25 19:03:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-25 19:03:48 +0100 |
| commit | e06996d54f8fca56ea355738c450946b310f0f1c (patch) | |
| tree | 2295a26046ac593379f3b5ebf56bec35d2674fe3 /sound | |
| parent | 2e4ff0c914fcf6e03eb5765328a8751cff6cf670 (diff) | |
| parent | 4c5258acfe7115382808a6697596b5efb91e2380 (diff) | |
| parent | 1657caf5d8c5f96528bb6b041028174ee2681681 (diff) | |
| parent | dd56ebadf4bfccb47a3b82d0b01a99c22967abc8 (diff) | |
| parent | 5e8351de740d9eff26cc146a6591a4e7517496b0 (diff) | |
Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5640', 'asoc/topic/rt5645' and 'asoc/topic/rt5670' into asoc-next