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)
commite97f9d817e600cd6f43d1d0da76f5787e33a5c56
tree99603834683039fec18a31770f8a05879d432e6d
parentc0cae2e24552d57f3e2f841ec235453413cd7389
parentb1cde7e21f950e05d18c102976c3b7d232b65e13
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
include/configs/am43xx_evm.h