1
0
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:
Albert ARIBAUD
2013-05-30 14:45:06 +02:00
305 changed files with 8284 additions and 15437 deletions

6
.gitignore vendored
View File

@@ -80,5 +80,11 @@ cscope.*
/ctags
/etags
# gnu global files
GPATH
GRTAGS
GSYMS
GTAGS
# spl ais files
/spl/*.ais