| commit | f343378b7ac72b7f7c645c6fb949ad07aff6f8fd | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Feb 26 16:49:58 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Wed Feb 26 16:49:58 2014 -0500 |
| tree | edea4b04062ec956158c163b13c9a31fcfdccde8 | |
| parent | ee03bd10671d1d99152927be0a61801c0c528cf3 [diff] | |
| parent | 958a8f87f9f933389dc88367ca80251d00189f2e [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.h Signed-off-by: Tom Rini <trini@ti.com>