Merge commit 'caeb85ae6fc056f0c1f0f7f8e1a79e3b7124129c'

Merge made by the 'ours' strategy.

* commit 'caeb85ae6fc056f0c1f0f7f8e1a79e3b7124129c':
  video: rockchip: mpp: fix rockchip_ipa_get_static_power crash

Change-Id: Ie293c8946ec8b9ad4ef2d949c06a22eaef74bfae
This commit is contained in:
Tao Huang
2024-02-06 17:04:33 +08:00

Diff Content Not Available