diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:46 +0000 |
| commit | 81b6863cae0ca371ebe8bd176548be4d2741e6bb (patch) | |
| tree | 165c192fc903841b04cee05a645bd5f2911d2492 /sound/soc/rockchip | |
| parent | 9451a469280adb721e3eca5eb3526c3331c2847d (diff) | |
| parent | d1afdf34fc17bd2e1c96dc6196c562fa8906a026 (diff) | |
| parent | 18560a4e3b07438113b50589e78532d95f907029 (diff) | |
| parent | b4c83b171557815a0b31a36805900cc9f21c9ee4 (diff) | |
| parent | 5f4f276077aeada88c3a7b9f1128c9c6284261cd (diff) | |
| parent | 5938448b99275cba95167c3f9d39ca9225fdad38 (diff) | |
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar', 'asoc/topic/rk3036' and 'asoc/topic/rockchip' into asoc-next