diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-29 12:44:34 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-29 12:44:34 -0700 |
| commit | d053c2b9b2193cbcba58d21ca15a50f6cd17a5c1 (patch) | |
| tree | 5ad57a3a81b8e92336fe241aecffd56025e72f42 /crypto/tcrypt.h | |
| parent | 971dec826c211c8fef4ed5b6db2cb048873a020b (diff) | |
| parent | 05f9033f74798aa27569ad7866b952ff51f83c26 (diff) | |
| parent | 3a6f9dce6116cc54e31dc10d176ceecb1a7e4e7f (diff) | |
| parent | 51a576400ea46fec0df1672b373de91b00aa4a30 (diff) | |
Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc/topic/rt5616' into asoc-next