diff options
author | Linaro CI <ci_notify@linaro.org> | 2021-01-07 13:38:33 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2021-01-07 13:38:33 +0000 |
commit | fef1ff7c9a5c3b3fba58e60e0be09f31841b3371 (patch) | |
tree | 73da83b08007722ac0a9e8fc1d765b4cc3439981 | |
parent | 23c51b5c5f0627a42a44ce92a006b1ca4c019fb6 (diff) | |
parent | 440726a20a5f03a28d95e6288576eaa343de7560 (diff) |
Merge remote-tracking branch 'camss-libcamera/tracking-qcomlt-camss-libcamera' into integration-linux-qcomlt
# Conflicts:
# drivers/media/platform/qcom/camss/camss-video.c
0 files changed, 0 insertions, 0 deletions