dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-08-31 08:12:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://88.191.163.10/u-boot-arm

Browse Source 
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2013-08-18 14:14:34 -04:00
parent f218761743 9ed887caec
commit e20cc2ca15
163 changed files with 6615 additions and 3539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -25,7 +25,7 @@
# Top-level generic files
#
/MLO
/MLO*
/SPL
/System.map
/u-boot