mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-13 20:36:02 +01:00
3c6a89e366
# Conflicts: # arch/arm/mach-sunxi/Kconfig # configs/A13-OLinuXinoM_defconfig # configs/A13-OLinuXino_defconfig # configs/A20-OLinuXino-Lime2_defconfig # configs/A20-Olimex-SOM204-EVB_defconfig # configs/A33-OLinuXino_defconfig # configs/Ainol_AW1_defconfig # configs/Ampe_A76_defconfig # configs/Cubietruck_defconfig # configs/Empire_electronix_d709_defconfig # configs/Empire_electronix_m712_defconfig # configs/Wobo_i5_defconfig # configs/Yones_Toptech_BS1078_V2_defconfig # configs/bananapi_m2_berry_defconfig # configs/colorfly_e708_q1_defconfig # configs/difrnce_dit4350_defconfig # configs/dserve_dsrv9703c_defconfig # configs/gt90h_v4_defconfig # configs/iNet_3F_defconfig # configs/iNet_3W_defconfig # configs/iNet_D978_rev2_defconfig # configs/icnova-a20-swac_defconfig # configs/inet86dz_defconfig # configs/inet98v_rev2_defconfig # configs/inet_q972_defconfig # configs/polaroid_mid2407pxe03_defconfig # configs/polaroid_mid2809pxe04_defconfig # configs/q8_a13_tablet_defconfig # configs/q8_a23_tablet_800x480_defconfig # configs/q8_a33_tablet_1024x600_defconfig # configs/q8_a33_tablet_800x480_defconfig