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)
commite99f30e105a253ee64bef1ef83b86a47e0d3b6f1
tree847e087ca50c1d0a02b750577b13af45aa498361
parentd6694aff569a0838a9d0ef352128f5aa309d73ff
parent12cc54376768461533b55ada1b0b6d4979f40579
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
arch/arm/cpu/armv7/omap3/board.c
board/ait/cam_enc_4xx/cam_enc_4xx.c