mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
Merge commit 'e0a6d5fa869c8ba0d109a415ca1bfa2d601d12df'
Merge made by the 'ours' strategy. * commit 'e0a6d5fa869c8ba0d109a415ca1bfa2d601d12df': media: rockchip: isp: support 8k for isp32 lite media: rockchip: isp: fix isp32 lite frame buffer data read media: rockchip: isp: add ioctl to get bay3d buf Change-Id: Ib2ecc6d25a106a71bb4239429da67ce8c6e4b1c1
This commit is contained in: