diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-30 15:55:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 15:55:41 +0100 |
| commit | d781c23e9b46f33c1c6c07febae36f37a11f9d4d (patch) | |
| tree | 77361cc997cb7fc6f199ed0b20a4ee2b7da0659f | |
| parent | acb47ad5023fbd29a2c9a681c28b33968c9dcc9e (diff) | |
| parent | 42d1b8ce2973c2f5956f4d4e4af002986ccc5748 (diff) | |
| parent | 637c4497bbf0c9a4e00d6be2731bd560bf609f6b (diff) | |
| parent | 618718dc56a49321a12f231b34f6c43f44c3c374 (diff) | |
Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next