diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 19:37:07 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 19:37:07 +0300 |
commit | 141dee78c40ac2c43aa4ff306688d625e1c731de (patch) | |
tree | 474813b50313c665d482968530de1bf8394c721a /Makefile | |
parent | ebfa3dccd2ee17383e68b9c516c47068457a4de7 (diff) | |
parent | af4b654f9fa87cf66a06f4841074b6738ed58606 (diff) | |
parent | 66ead502af7de65d1e555189cdca8f47eddac400 (diff) | |
download | linux-141dee78c40ac2c43aa4ff306688d625e1c731de.tar.xz |
Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next