diff options
| author | Tom Rini <trini@ti.com> | 2013-11-04 09:28:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-04 09:28:08 -0500 |
| commit | c0bb110b695130866838518e680bdd5473e47928 (patch) | |
| tree | 590563a50a027ad53867b2144e763de02427db59 /include/configs/bf533-stamp.h | |
| parent | ae12c751e5532904090c23f079e4b59160caef52 (diff) | |
| parent | cae4d0403c0863176f228d410d6a29b3f4b9d595 (diff) | |
| download | u-boot-imx-c0bb110b695130866838518e680bdd5473e47928.zip u-boot-imx-c0bb110b695130866838518e680bdd5473e47928.tar.gz u-boot-imx-c0bb110b695130866838518e680bdd5473e47928.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Easy to resolve conflict on the GPIO change.
Conflicts:
arch/blackfin/cpu/Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/bf533-stamp.h')
0 files changed, 0 insertions, 0 deletions