Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-15 01:17:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm/include
History
Albert ARIBAUD 19d829fa60 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 
Conflicts:
	drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
2013-09-05 11:15:26 +02:00
..
asm Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-09-05 11:15:26 +02:00