diff options
author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:16:21 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:16:21 +0900 |
commit | fc180c0eafd9c55237b84101853f87746ffc92cd (patch) | |
tree | 04302a6182af48b029de819f4da250998be9889c /security | |
parent | 757fc30a1a9711ac00d958d4c3386dd904bc1295 (diff) | |
parent | f49efce4ed6fdec17a32406eccb56fc167f43b6c (diff) | |
parent | 7952b4baff402ddca1a263380bfd142f10290eb8 (diff) | |
parent | 9ba2da5f5d18daaa365ab5426b05e16f1d114786 (diff) | |
parent | 7b87463edf3e2c16d72eeea3d1cf3c12bb5487c6 (diff) | |
download | op-kernel-dev-fc180c0eafd9c55237b84101853f87746ffc92cd.zip op-kernel-dev-fc180c0eafd9c55237b84101853f87746ffc92cd.tar.gz |
Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5514', 'asoc/topic/rt5645' and 'asoc/topic/rt5677' into asoc-next