brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-08 04:06:15 +09:00
Code Issues Projects Releases Wiki Activity
00b132bf34
u-boot-brain/arch/arm
History
Albert ARIBAUD ab6423cae0 Merge branch 'u-boot/master' into 'u-boot-arm/master' 
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c
2014-03-25 10:53:15 +01:00
..
cpu Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
dts board:trats2: Enable device tree on Trats2 2014-03-12 19:55:00 +09:00
imx-common kbuild: use shorten logs for IMX images 2014-02-25 11:01:29 -05:00
include/asm Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
lib ahci-plat: Provide a weak scsi_init hook 2014-03-10 13:50:31 -04:00
config.mk kbuild: move "checkthumb" to ARM archprepare 2014-03-07 10:59:06 -05:00