| commit | c0bb110b695130866838518e680bdd5473e47928 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Nov 04 09:28:08 2013 -0500 |
| committer | Tom Rini <trini@ti.com> | Mon Nov 04 09:28:08 2013 -0500 |
| tree | 590563a50a027ad53867b2144e763de02427db59 | |
| parent | ae12c751e5532904090c23f079e4b59160caef52 [diff] | |
| parent | cae4d0403c0863176f228d410d6a29b3f4b9d595 [diff] |
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>