diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-08 16:44:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-08 16:44:50 +0100 |
| commit | bdf20b4291eaa3b327398b8dd330065ad8e6d3ce (patch) | |
| tree | 9ceae86821af68aa3dbf797269f013fd2d032ef6 | |
| parent | 699f8584305cb5b4ba69c6880c64be1f8f15a563 (diff) | |
| parent | 77eca3cd461da663945eceddf454466a609d8ca4 (diff) | |
| parent | 960baba41f3cfb0a97bb1f0e720334156b2eff75 (diff) | |
| parent | 5c4c99f32226321e152b1462a1884ff2dfd3b3e2 (diff) | |
| parent | a66ae631a3cffb00f441b229a07fa1b4c72e738a (diff) | |
| parent | 528a82b41fda78435976c905546c3329c86bb264 (diff) | |
| parent | 2dbab9784db1c0de517922d81394d9ff4a33c544 (diff) | |
Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl', 'asoc/fix/imx', 'asoc/fix/mc13783', 'asoc/fix/rockchip' and 'asoc/fix/simple' into asoc-linusasoc-v3.18-2