common · disable_httpd · Fork / U-Boot · GitLab

Snippets Groups Projects

Merge branch 'mediatek' into ex300

Kenneth Johansson authored 8 years ago

Conflicts:
 drivers/mtd/nand/Makefile
 drivers/mtd/nand/nand_bbt.c
 tools/env/fw_env.c

conflicts fixed.

9c4fe5cc

9c4fe5cc 8 years ago

Name	Last commit	Last update
..
eeprom
init
spl
Kconfig
Makefile
autoboot.c
bedbug.c
board_f.c
board_info.c
board_r.c
bootm.c
bootm_os.c
bootretry.c
bootstage.c
bouncebuf.c
cli.c
cli_hush.c
cli_readline.c
cli_simple.c
command.c
console.c
cros_ec.c
ddr_spd.c
dlmalloc.c
dlmalloc.src
edid.c
env_attr.c
env_callback.c
env_common.c
env_dataflash.c
env_eeprom.c
env_embedded.c
env_ext4.c
env_fat.c
env_flags.c
env_flash.c
env_mmc.c
env_nand.c
env_nowhere.c
env_nvram.c
env_onenand.c
env_remote.c
env_sata.c
env_sf.c
env_ubi.c
exports.c
fb_mmc.c
fb_nand.c
fdt_support.c
flash.c
hash.c
hwconfig.c
ide.c
image-android.c
image-fdt.c
image-fit.c
image-sig.c
image-sparse.c
image.c
iomux.c
iotrace.c
kallsyms.c
kgdb.c
kgdb_stubs.c
lcd.c
lcd_console.c
lcd_console_rotation.c
lcd_simplefb.c
lynxkdi.c
main.c
malloc_simple.c
memsize.c
menu.c
miiphyutil.c
s_record.c
sata.c
scsi.c
splash.c
splash_source.c
stdio.c
system_map.c
update.c
usb.c
usb_hub.c
usb_kbd.c
usb_storage.c
xyzModem.c