]> 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>
Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 1 Jul 2014 13:11:18 +0000 (15:11 +0200)
1  2 
arch/arm/cpu/armv7/omap3/board.c
board/ait/cam_enc_4xx/cam_enc_4xx.c

Simple merge
Simple merge