diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 10:47:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 10:47:45 +0000 |
| commit | 01c2a84c491cf1cceaf696c69870667d9563f7d0 (patch) | |
| tree | a1fccb6a65818dac53f75ba52fd3064dc50765a9 /include/trace | |
| parent | a121103c922847ba5010819a3f250f1f7fc84ab8 (diff) | |
| parent | d2e3a1358c37cd82eef92b5e908b4f0472194481 (diff) | |
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
Diffstat (limited to 'include/trace')