Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:00:00 +0000 (12:00 -0500)
committerTom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:00:00 +0000 (12:00 -0500)
commit746667f1e56bf08d03e66a178df3c4f4f6c806e1
treee42c7fd72cb1ef97a5a05a73b06b3cd2fc118147
parent6c016485a685b5cdac28edb25147311a3e88d51f
parentfe5b9b447c6eea3873833b1f3ba15c9854aa2ef8
Merge git://git.denx.de/u-boot-x86

Conflicts:
arch/x86/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>
Makefile
arch/x86/cpu/Makefile
arch/x86/cpu/coreboot/pci.c
arch/x86/cpu/coreboot/sdram.c
common/board_f.c