brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-15 01:03:24 +09:00
Code Issues Projects Releases Wiki Activity
933aa01714
u-boot-brain/arch/arm/include
History
Tom Rini e20cc2ca15 Merge branch 'master' of git://88.191.163.10/u-boot-arm 
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>
2013-08-18 14:14:34 -04:00
..
asm Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18 14:14:34 -04:00