| commit | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 | [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 | 6c016485a685b5cdac28edb25147311a3e88d51f [diff] | |
| parent | fe5b9b447c6eea3873833b1f3ba15c9854aa2ef8 [diff] |
Merge git://git.denx.de/u-boot-x86 Conflicts: arch/x86/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>