cronyx 8a6ee39971 resolve conflicts		2022-09-06 11:01:28 +03:00
..
board/t31	Update Vixand configs [skip ci] (#418)	2022-08-29 12:36:28 +03:00
configs	resolve conflicts	2022-09-06 11:01:28 +03:00
linux	ingenic init and update docs	2021-08-05 22:12:58 +03:00
package	resolve conflicts	2022-09-06 11:01:28 +03:00
Config.in	resolve conflicts	2022-09-06 11:01:28 +03:00
external.desc	ingenic init and update docs	2021-08-05 22:12:58 +03:00
external.mk	resolve conflicts	2022-09-06 11:01:28 +03:00