diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-12 23:04:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:04:35 +0000 |
| commit | a4b12990b68079290ab62799035afe175b4bdc23 (patch) | |
| tree | ace02d498d6c7d98178ae4d6a15b0e53dfdbee93 /include/trace | |
| parent | 84f6965e2b49be82bda0cc794c9a01b8b500cb37 (diff) | |
| parent | c3518d1bd45ebfdfd88480e5781054fed378fb22 (diff) | |
| parent | 89c6785715592a6b082b3f9f28c27bb14b041c7d (diff) | |
| parent | 7cb5e1bb9f91bf984f26b520072a22610235d869 (diff) | |
| parent | a9576cbbbafa2c687121638dadebfb136562a522 (diff) | |
| parent | ba9c949f797aa3af56303445812a452144c61c35 (diff) | |
Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next