mirror of
https://xff.cz/git/u-boot/
synced 2025-08-31 16:22:36 +02:00
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -80,5 +80,11 @@ cscope.*
|
||||
/ctags
|
||||
/etags
|
||||
|
||||
# gnu global files
|
||||
GPATH
|
||||
GRTAGS
|
||||
GSYMS
|
||||
GTAGS
|
||||
|
||||
# spl ais files
|
||||
/spl/*.ais
|
||||
|
Reference in New Issue
Block a user