diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-30 13:50:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-30 13:50:31 +0100 |
commit | ad21edcdb2172c0d8f47f856867104e331525820 (patch) | |
tree | dbe02aea09866d0630bad225795e602d561d16d3 /crypto/lz4hc.c | |
parent | 6d9deb7ad4559c9361701e9df7ccf1fb0be02cf9 (diff) | |
parent | 7d42a7f293da03387cd8737a360c89c81640b67d (diff) | |
parent | 23b1134838efdb5872be7b75e86fae41e60ba629 (diff) | |
parent | 7179569aeb52197fd2a9909ba226c4c9cc0e2e2a (diff) |
Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next