]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 29 Jan 2014 13:07:50 +0000 (14:07 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 29 Jan 2014 13:07:50 +0000 (14:07 +0100)
1  2 
include/configs/am43xx_evm.h

Simple merge