| commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 | [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 | 715b56fe2b47e073e6f2425e0cedba0e92a4014d [diff] | |
| parent | 1551df35f296f0a8df32f4f2054254f46e8be252 [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>