openwrt-6.x/target/linux/rockchip
Tianling Shen 0b6bea5af1
rockchip: fix merge conflict
Fixes: 6e384969c3 ("Merge Official Source")

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-06-21 01:24:10 +08:00
..
armv8 rockchip: add kernel 5.15 as testing 2022-06-18 22:11:26 +02:00
files rockchip: remove kernel 5.10 support 2022-05-20 18:51:34 +08:00
image rockchip: enable lzma compression for kernel 2022-03-29 23:39:45 +08:00
patches-5.15 rockchip: fix merge conflict 2022-06-21 01:24:10 +08:00
Makefile rockchip: add kernel 5.15 as testing 2022-06-18 22:11:26 +02:00
modules.mk rockchip: remove kernel 5.10 support 2022-05-20 18:51:34 +08:00