mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 02:50:49 +09:00
0fa451f5bc
* commit '955d8bfa4bbfbaf1f770c9cd86eaf828f82fb470':
arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96772
net: wireless: rockchip_wlan: porting infineon driver.
input: sensor: accel/gyro sensor: support iam20680.
arm64: dts: rockchip: vehicle-s66: support iam20680.
media: rockchip: isp: fix repeated reporting statistics if stats video on/off
mfd: max96755f: lock status and link reg need access directly.
drm/bridge: maxim-max96755: support dual link mode.
drm/panel: Add panel driver for Maxim MAX96772 based LCDs
media: i2c: it6616: modify set ctrl when video stable
media: i2c: lt6911uxe: modify rk3588_dcphy params
Conflicts:
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_custom_msm.c
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux.h
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux_platdev.c
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_pcie_linux.c
drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/wl_cfgvendor.c
Ignore:
commit a748a1bd1c ("net: wireless: rockchip_wlan: porting infineon driver.")
Change-Id: Id9ebcbe2e66b64ed3f64f59bcfed5be42860bc6e