| commit | b660ae76be745776d7c40e07cd2cfb5c1d4665ad | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Nov 24 12:00:00 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Mon Nov 24 12:00:00 2014 -0500 |
| tree | e42c7fd72cb1ef97a5a05a73b06b3cd2fc118147 | |
| parent | ac1cf36eb28d6f577faea7e18fda095caf6a0b80 [diff] | |
| parent | 26a22407f994b88671055aead7b7def33869baf7 [diff] |
Merge git://git.denx.de/u-boot-x86 Conflicts: arch/x86/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>