Merge git://git.denx.de/u-boot-x86

Conflicts:
	arch/x86/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc Makefile
Simple merge

diff --cc arch/x86/cpu/Makefile
index 8dd7b06,97f36d5..2b9e9b9
--- 1/arch/x86/cpu/Makefile
--- 2/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@@ -11,5 -11,4 +11,6 @@@
  extra-y       = start.o
  obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
  obj-y += interrupts.o cpu.o call64.o
 +
 +obj-$(CONFIG_SYS_COREBOOT) += coreboot/
+ obj-$(CONFIG_PCI) += pci.o

diff --cc arch/x86/cpu/coreboot/pci.c
Simple merge

diff --cc arch/x86/cpu/coreboot/sdram.c
Simple merge

diff --cc common/board_f.c
Simple merge